From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Mon, 25 Jul 2005 09:44:12 +0000 (+0000)
Subject: * AUTHORS: add a location to bigben's entry to prevent the OSX-About-Window-Parser... 
X-Git-Tag: 0.8.4~1168
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=feebdf7d844deb3a0fdd0a2fb2b9ad42ce1c65fa;p=vlc

* 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
---

diff --git a/AUTHORS b/AUTHORS
index f48819559c..1a6425699c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -308,6 +308,7 @@ E: bigben@videolan.org
 C: bigben
 D: MacOS X Interface (playlist)
 D: documentation
+S: France / Germany
 
 N: Emmanuel Puig
 E: karibu@videolan.org
diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index d60cf0b7d4..589abbbdba 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -57,9 +57,6 @@ static VLAboutBox *_o_sharedInstance = nil;
         NSString *o_name;
         NSString *o_version;
         NSString *o_thanks_path;
-        
-		/* Load the needed nib-file */
-		[NSBundle loadNibNamed:@"About" owner:self];
 		
         /* Get the info dictionary (Info.plist) */
         o_info_dict = [[NSBundle mainBundle] infoDictionary];
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index a0dcff6d88..004add4c17 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -92,6 +92,7 @@ struct intf_sys_t
     id o_open;                  /* VLCOpen        */
     id o_wizard;                /* VLCWizard      */
     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 */
 
     IBOutlet id o_window;       /* main window    */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 7257f74c96..a9fc616f80 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1447,7 +1447,13 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)viewAbout:(id)sender
 {
-    [o_about showPanel];
+    if (!nib_about_loaded)
+    {
+        nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+        [o_about showPanel];
+    } else {
+        [o_about showPanel];
+    }
 }
 
 - (IBAction)viewPreferences:(id)sender