Commit 511519e3 authored by David Fuhrmann's avatar David Fuhrmann

macosx: priorize native fullscreen over non-embedded window

This fixes some problematic behaviour, when the user changed some settings
but has still not made a restart.
parent 67e869c5
......@@ -126,8 +126,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
/* setup the styled interface */
b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7
if( config_GetInt( VLCIntf, "embedded-video" ))
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
#endif
i_lastShownVolume = -1;
t_hide_mouse_timer = nil;
......@@ -1382,7 +1381,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (id)setupVideoView
{
vout_thread_t *p_vout = getVout();
if (config_GetInt( VLCIntf, "embedded-video" ))
if (config_GetInt( VLCIntf, "embedded-video" ) || (OSX_LION && b_nativeFullscreenMode))
{
if ([o_video_view window] != self)
{
......
......@@ -614,8 +614,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* yeah, we are done */
b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7
if( config_GetInt( VLCIntf, "embedded-video" ))
b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
#endif
nib_main_loaded = TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment