[vlc-commits] macosx: refix bugs by initializing MainWindow in OpenIntf

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Thu Jul 30 18:49:53 2015 +0200| [329b882090e0a522b59adb86c49bdf76959d7977] | committer: David Fuhrmann

macosx: refix bugs by initializing MainWindow in OpenIntf

Fixes regressions introduced in f450457875207163ddb4f435e0bb5dc868e35ee8.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=329b882090e0a522b59adb86c49bdf76959d7977
---

 modules/gui/macosx/intf.m |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 4edf1f2..1cb6ad1 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -83,6 +83,8 @@ int OpenIntf (vlc_object_t *p_this)
         [[VLCMain sharedInstance] setIntf: p_intf];
 
         [NSBundle loadNibNamed:@"MainMenu" owner:[[VLCMain sharedInstance] mainMenu]];
+        [NSBundle loadNibNamed:@"MainWindow" owner:[VLCMain sharedInstance]];
+        [[[VLCMain sharedInstance] mainWindow] makeKeyAndOrderFront:nil];
 
         [VLCVoutWindowController sharedInstance];
 
@@ -204,6 +206,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
 
         _mainmenu = [[VLCMainMenu alloc] init];
         _voutController = [[VLCVoutWindowController alloc] init];
+        _playlist = [[VLCPlaylist alloc] init];
     }
 
     return self;
@@ -221,9 +224,6 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
 
 - (void)applicationWillFinishLaunching:(NSNotification *)aNotification
 {
-    _playlist = [[VLCPlaylist alloc] init];
-    [NSBundle loadNibNamed:@"MainWindow" owner:self];
-    [[self mainWindow] makeKeyAndOrderFront:nil];
     _open = [[VLCOpen alloc] init];
     _coreinteraction = [VLCCoreInteraction sharedInstance];