From: David Fuhrmann <dfuhrmann@videolan.org>
Date: Sat, 21 Mar 2015 17:30:21 +0000 (+0100)
Subject: macosx: fix main menu initialization order on startup
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=34e54feea7de9f75e6b2085df4a12235a516571a

macosx: fix main menu initialization order on startup

MainMenus p_intf can be already accessed before
applicationWillFinishLaunching was called.

This should fix quite some crashes reported by the users.
---

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 3c678e387d..9593ad756c 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -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;