[vlc-devel] commit: don't reset the controls when awaking from nib, but when showing our window ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Mar 12 20:35:50 2008 +0100| [d95df6f6e9bdfe4d6b169a858a51efa0eded87cb]

don't reset the controls when awaking from nib, but when showing our window

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d95df6f6e9bdfe4d6b169a858a51efa0eded87cb
---

 modules/gui/macosx/simple_prefs.m |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index caec1fb..2155a20 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -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];
 }