Commit 329b8820 authored by David Fuhrmann's avatar David Fuhrmann

macosx: refix bugs by initializing MainWindow in OpenIntf

Fixes regressions introduced in f4504578.
parent 3fc28a0b
......@@ -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];
......
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