* AUTHORS: add a location to bigben's entry to prevent the OSX-About-Window-Parser...
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 25 Jul 2005 09:44:12 +0000 (09:44 +0000)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 25 Jul 2005 09:44:12 +0000 (09:44 +0000)
* other files: small patch to make sure that About.nib is loaded only once

AUTHORS
modules/gui/macosx/about.m
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m

diff --git a/AUTHORS b/AUTHORS
index f488195..1a64256 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
index d60cf0b..589abbb 100644 (file)
@@ -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];
index a0dcff6..004add4 100644 (file)
@@ -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    */
index 7257f74..a9fc616 100644 (file)
@@ -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