[vlc-commits] macosx: fix issue where fullscreen controls are deactivated then video starts from lion fullscreen mode

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Apr 23 19:42:33 2012 +0200| [942bd31c390d819c41d5cdccfea70ee884cfa538] | committer: David Fuhrmann

macosx: fix issue where fullscreen controls are deactivated then video starts from lion fullscreen mode

close #6351
(cherry picked from commit 42f72172d84ba84b177e5bbec2115cc6ac3eaf4c)

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

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

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

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index dd36138..9ccd256 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1541,7 +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 )
+            [o_fspanel setActive: nil];
+        else
             [o_fspanel setNonActive: nil];
     }