[vlc-commits] macosx: fix closing detached windows when in lion fullscreen

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat Feb  9 10:51:12 2013 +0100| [20c4f1a92dc952286f6511ef93cf855cca966221] | committer: David Fuhrmann

macosx: fix closing detached windows when in lion fullscreen

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=20c4f1a92dc952286f6511ef93cf855cca966221
---

 modules/gui/macosx/VLCVoutWindowController.m |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 4430c7b..4429c01 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -201,18 +201,14 @@
     if ([o_window fullscreen] && ![[VLCMainWindow sharedInstance] nativeFullscreenMode])
         [o_window leaveFullscreen];
 
-    if (![NSStringFromClass([o_window class]) isEqualToString:@"VLCMainWindow"] &&
-            [o_window fullscreen] &&
-            [[VLCMainWindow sharedInstance] nativeFullscreenMode])
-        [o_window toggleFullScreen: self];
-
+    [[o_window videoView] releaseVoutThread];
+    [o_window setHasActiveVideo: NO];
 
     if (![NSStringFromClass([o_window class]) isEqualToString:@"VLCMainWindow"]) {
+        [o_window close];
         [o_window orderOut:self];
     }
 
-    [[o_window videoView] releaseVoutThread];
-    [o_window setHasActiveVideo: NO];
     [o_vout_dict removeObjectForKey:o_key];
 
     if ([o_vout_dict count] == 0)