[vlc-commits] macosx: removed wrong check, which could make the video output disappear when leaving fullscreen mode in rare cases (close #6856)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon May 21 11:39:14 2012 +0200| [01e99e18ae3386e46e3df5596aaf47b10b4efc39] | committer: Felix Paul Kühne

macosx: removed wrong check, which could make the video output disappear when leaving fullscreen mode in rare cases (close #6856)
(cherry picked from commit 7100a8c8c8ba7364d5543c13ae70040a16aee17c)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=01e99e18ae3386e46e3df5596aaf47b10b4efc39
---

 modules/gui/macosx/MainWindow.m |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 0dd9260..e3f74db 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -2003,13 +2003,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_video_view setFrame:[o_temp_view frame]];
     if( [[o_video_view subviews] count] > 0 )
         [[o_video_view window] makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
-    if( [[o_video_view window] isVisible] )
-    {
-        if( !b_nonembedded )
+    if( !b_nonembedded )
             [super makeKeyAndOrderFront:self]; /* our version contains a workaround */
-        else
-            [[o_video_view window] makeKeyAndOrderFront: self];
-    }
+    else
+        [[o_video_view window] makeKeyAndOrderFront: self];
     [o_fullscreen_window orderOut: self];
     NSEnableScreenUpdates();