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

* other files: small patch to make sure that About.nib is loaded only once

diff --git a/AUTHORS b/AUTHORS
index f48819559c5975a24b14ea57c91a0855d60f7298..1a6425699c064daac9a236417f915cd16f9d0d6c 100644 (file)
--- 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 d60cf0b7d4c9a88a167551303f8de728b3924ff7..589abbbdba5757cf1ee75904c27a126ebf15d477 100644 (file)
--- 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 a0dcff6d887daf5eff37db3518b35047c2be248c..004add4c17806d0f276f8695638873cadc1eca20 100644 (file)
--- 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 7257f74c9676e1567d86d197a381f5f3a4d1a718..a9fc616f8001fda426953e60f42b81de8accd95c 100644 (file)
--- 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