Commit b71b4312 authored by David Fuhrmann's avatar David Fuhrmann

macosx: select right screen when fullscreen on startup is enabled

close #7051
parent 7d42f68a
...@@ -1950,13 +1950,10 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1950,13 +1950,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
NSScreen *screen; NSScreen *screen;
NSRect screen_rect; NSRect screen_rect;
NSRect rect; NSRect rect;
vout_thread_t *p_vout = getVout();
BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" ); BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
id o_videoWindow = b_nonembedded ? o_detached_video_window : self; id o_videoWindow = b_nonembedded ? o_detached_video_window : self;
if( p_vout ) screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)config_GetInt( VLCIntf, "macosx-vdev" )];
screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)config_GetInt( VLCIntf, "macosx-vdev" )];
[self lockFullscreenAnimation]; [self lockFullscreenAnimation];
if (!screen) if (!screen)
...@@ -1970,9 +1967,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1970,9 +1967,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
screen = [NSScreen deepestScreen]; screen = [NSScreen deepestScreen];
} }
if( p_vout )
vlc_object_release( p_vout );
screen_rect = [screen frame]; screen_rect = [screen frame];
[o_fullscreen_btn setState: YES]; [o_fullscreen_btn setState: YES];
......
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