[vlc-commits] macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857)

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jan 15 17:13:16 2012 +0100| [47a585998cc3540d57e964276ecf31a9d5a8b869] | committer: Jean-Baptiste Kempf

macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857)
(cherry picked from commit b0ac1fc6a24b2835d4af359a7d3847c80b0a3e9b)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=47a585998cc3540d57e964276ecf31a9d5a8b869
---

 modules/gui/macosx/MainWindow.m |   10 +++++-----
 modules/gui/macosx/intf.m       |    3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 5b6d4d5..536dc95 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -121,10 +121,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)awakeFromNib
 {
     /* setup the styled interface */
-#ifdef MAC_OS_X_VERSION_10_7
-    b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
-#else
+#ifndef MAC_OS_X_VERSION_10_7
     b_nativeFullscreenMode = NO;
+#else
+    b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
 #endif
     i_lastShownVolume = -1;
     t_hide_mouse_timer = nil;
@@ -1491,7 +1491,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_fullscreen_btn setState: NO];
 
     /* We always try to do so */
-    if (!(OSX_LION && b_nativeFullscreenMode))
+    if (!(OSX_LION || !b_nativeFullscreenMode))
         [NSScreen unblackoutScreens];
     vout_thread_t *p_vout = getVout();
     if (p_vout)
@@ -1656,7 +1656,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)orderOut: (id)sender
 {
     /* Make sure we leave fullscreen */
-    if (!(OSX_LION && b_nativeFullscreenMode))
+    if (!(OSX_LION || !b_nativeFullscreenMode))
         [self leaveFullscreenAndFadeOut: YES];
 
     [super orderOut: sender];
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 143c3e4..705da58 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -614,7 +614,10 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_msgs_refresh_btn setImage: [NSImage imageNamed: NSImageNameRefreshTemplate]];
 
     /* yeah, we are done */
+    b_nativeFullscreenMode = NO;
+#ifdef MAC_OS_X_VERSION_10_7
     b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
+#endif
     nib_main_loaded = TRUE;
 }