Commit 9eb1e87c authored by David Fuhrmann's avatar David Fuhrmann

macosx: load core dialog nib on demand

parent 7d67bb4b
...@@ -493,7 +493,7 @@ static int DialogCallback(vlc_object_t *p_this, const char *type, vlc_value_t pr ...@@ -493,7 +493,7 @@ static int DialogCallback(vlc_object_t *p_this, const char *type, vlc_value_t pr
} }
NSValue *o_value = [NSValue valueWithPointer:value.p_address]; NSValue *o_value = [NSValue valueWithPointer:value.p_address];
[[VLCCoreDialogProvider sharedInstance] performEventWithObject: o_value ofType: type]; [[[VLCMain sharedInstance] coreDialogProvider] performEventWithObject: o_value ofType: type];
[o_pool release]; [o_pool release];
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -682,8 +682,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -682,8 +682,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_SetBool(p_playlist, "fullscreen", YES); var_SetBool(p_playlist, "fullscreen", YES);
} }
/* load our Core and Shared Dialogs nibs */ /* load our Shared Dialogs nib */
nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
[NSBundle loadNibNamed:@"SharedDialogs" owner: NSApp]; [NSBundle loadNibNamed:@"SharedDialogs" owner: NSApp];
/* subscribe to various interactive dialogues */ /* subscribe to various interactive dialogues */
...@@ -1659,10 +1658,11 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1659,10 +1658,11 @@ static VLCMain *_o_sharedMainInstance = nil;
- (id)coreDialogProvider - (id)coreDialogProvider
{ {
if (o_coredialogs) if (!nib_coredialogs_loaded) {
return o_coredialogs; nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
}
return nil; return o_coredialogs;
} }
- (id)eyeTVController - (id)eyeTVController
......
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