Commit feebdf7d authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

* AUTHORS: add a location to bigben's entry to prevent the OSX-About-Window-Parser from crashing

* other files: small patch to make sure that About.nib is loaded only once
parent e0fc9703
...@@ -308,6 +308,7 @@ E: bigben@videolan.org ...@@ -308,6 +308,7 @@ E: bigben@videolan.org
C: bigben C: bigben
D: MacOS X Interface (playlist) D: MacOS X Interface (playlist)
D: documentation D: documentation
S: France / Germany
N: Emmanuel Puig N: Emmanuel Puig
E: karibu@videolan.org E: karibu@videolan.org
......
...@@ -58,9 +58,6 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -58,9 +58,6 @@ static VLAboutBox *_o_sharedInstance = nil;
NSString *o_version; NSString *o_version;
NSString *o_thanks_path; NSString *o_thanks_path;
/* Load the needed nib-file */
[NSBundle loadNibNamed:@"About" owner:self];
/* Get the info dictionary (Info.plist) */ /* Get the info dictionary (Info.plist) */
o_info_dict = [[NSBundle mainBundle] infoDictionary]; o_info_dict = [[NSBundle mainBundle] infoDictionary];
......
...@@ -92,6 +92,7 @@ struct intf_sys_t ...@@ -92,6 +92,7 @@ struct intf_sys_t
id o_open; /* VLCOpen */ id o_open; /* VLCOpen */
id o_wizard; /* VLCWizard */ id o_wizard; /* VLCWizard */
BOOL nib_open_loaded; /* reference to the open-nib */ BOOL nib_open_loaded; /* reference to the open-nib */
BOOL nib_about_loaded; /* reference to the about-nib */
BOOL nib_wizard_loaded; /* reference to the wizard-nib */ BOOL nib_wizard_loaded; /* reference to the wizard-nib */
IBOutlet id o_window; /* main window */ IBOutlet id o_window; /* main window */
......
...@@ -1447,7 +1447,13 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1447,7 +1447,13 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)viewAbout:(id)sender - (IBAction)viewAbout:(id)sender
{ {
if (!nib_about_loaded)
{
nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
[o_about showPanel];
} else {
[o_about showPanel]; [o_about showPanel];
}
} }
- (IBAction)viewPreferences:(id)sender - (IBAction)viewPreferences:(id)sender
......
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