- (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;
[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)
- (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];
[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;
}