[vlc-commits] macosx: select right screen when fullscreen on startup is enabled

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Jul  6 14:54:11 2012 +0200| [080a5c3dbed4fe9a6e70c8c56ee07d9dc7388823] | committer: David Fuhrmann

macosx: select right screen when fullscreen on startup is enabled

close #7051
(cherry picked from commit b71b4312976d6ee7b067c8dbfeb59dab83da5505)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

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

 modules/gui/macosx/MainWindow.m |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index c90a26f..ee86c8a 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1741,13 +1741,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
     NSScreen *screen;
     NSRect screen_rect;
     NSRect rect;
-    vout_thread_t *p_vout = getVout();
     BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
     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];
 
     if (!screen)
@@ -1761,9 +1758,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
         screen = [NSScreen deepestScreen];
     }
 
-    if( p_vout )
-        vlc_object_release( p_vout );
-
     screen_rect = [screen frame];
 
     [o_fullscreen_btn setState: YES];