]> git.sesse.net Git - vlc/commitdiff
macosx: fix main menu initialization order on startup
authorDavid Fuhrmann <dfuhrmann@videolan.org>
Sat, 21 Mar 2015 17:30:21 +0000 (18:30 +0100)
committerDavid Fuhrmann <dfuhrmann@videolan.org>
Sat, 21 Mar 2015 17:32:18 +0000 (18:32 +0100)
MainMenus p_intf can be already accessed before
applicationWillFinishLaunching was called.

This should fix quite some crashes reported by the users.

modules/gui/macosx/MainMenu.m

index 3c678e387d7456f9aacbcbd567546129ece68538..9593ad756c0d89274c9107f5943228fa8ff373ea 100644 (file)
@@ -139,12 +139,12 @@ static VLCMainMenu *_o_sharedInstance = nil;
     }
 
     [self setRateControlsEnabled:NO];
+
+    p_intf = VLCIntf;
 }
 
 - (void)applicationWillFinishLaunching:(NSNotification *)o_notification
 {
-    p_intf = VLCIntf;
-
     NSString* o_key;
     playlist_t *p_playlist;
     vlc_value_t val;