]> git.sesse.net Git - vlc/commitdiff
don't reset the controls when awaking from nib, but when showing our window
authorFelix Paul Kühne <fkuehne@videolan.org>
Wed, 12 Mar 2008 19:35:50 +0000 (20:35 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 12 Mar 2008 19:35:50 +0000 (20:35 +0100)
modules/gui/macosx/simple_prefs.m

index caec1fb8cca1dc60b0b2f0f265cdd63712cb4091..2155a20df11177eee519937eb38cfa3405831a1d 100644 (file)
@@ -92,8 +92,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 - (void)awakeFromNib
 {
     [self initStrings];
-
-    [self resetControls];
     
     /* setup the toolbar */
     o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease];
@@ -405,6 +403,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         [o_sprefs_toolbar setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
         [self showInterfaceSettings];
     }
+    
+    [self resetControls];
 
     [o_sprefs_win makeKeyAndOrderFront: self];
 }