[vlc-commits] macosx: small clarification regarding fullscreen controller

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Apr 30 09:01:42 2012 +0200| [7ef075a98444cab69410f4a1254a2bf5187be082] | committer: David Fuhrmann

macosx: small clarification regarding fullscreen controller
(cherry picked from commit 37f24581df46af51482f3acf7df120522eec4d77)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

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

 modules/gui/macosx/MainWindow.m |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 7107d36..8429d5e 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -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];
 }