]> git.sesse.net Git - vlc/commitdiff
macosx: small clarification regarding fullscreen controller
authorDavid Fuhrmann <david.fuhrmann@googlemail.com>
Mon, 30 Apr 2012 07:01:42 +0000 (09:01 +0200)
committerDavid Fuhrmann <david.fuhrmann@googlemail.com>
Mon, 30 Apr 2012 07:08:06 +0000 (09:08 +0200)
modules/gui/macosx/MainWindow.m

index 9168c8f5fa5dc59ccb1211a52cdc93e3b464a334..dea33d6c729a3c383c7756f53b6658c8332ed4b4 100644 (file)
@@ -1541,9 +1541,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
             [o_bottombar_view setHidden: b_videoPlayback];
         else
             [o_bottombar_view setHidden: NO];
-        if( b_videoPlayback )
+        if( b_videoPlayback && b_fullscreen )
             [o_fspanel setActive: nil];
-        else
+        if( !b_videoPlayback )
             [o_fspanel setNonActive: nil];
     }
 
@@ -1848,8 +1848,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
     if( [o_videoWindow isVisible] )
         [o_videoWindow orderOut: self];
 
-    [o_fspanel setActive: nil];
-
     b_fullscreen = YES;
     [self unlockFullscreenAnimation];
 }