[vlc-commits] macosx: fixed a logic problem which prevent the proper exit off the fullscreen mode when using the 64bit linked against the 10 .7 SDK on 10.6 (close #6157)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Feb 26 20:09:54 2012 +0100| [76d16893cfb15a604b9a9ebc64147054aaf030d1] | committer: Felix Paul Kühne

macosx: fixed a logic problem which prevent the proper exit off the fullscreen mode when using the 64bit linked against the 10.7 SDK on 10.6 (close #6157)
(cherry picked from commit 4e7ebf8df7f57dafa2a9e4ad1486cc4908aa4e6f)

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

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

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 46be64e..4bedaf8 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1339,8 +1339,11 @@ return YES;
     else
         [self makeFirstResponder: nil];
 
-    if (!b_videoPlayback && b_fullscreen && !b_nativeFullscreenMode)
-        [[VLCCoreInteraction sharedInstance] toggleFullscreen];
+    if (!b_videoPlayback && b_fullscreen)
+    {
+        if (!b_nativeFullscreenMode || !OSX_LION)
+            [[VLCCoreInteraction sharedInstance] toggleFullscreen];
+    }
 }
 
 - (void)resizeWindow