macosx: Remove unneeded restart.

[vlc] / modules / gui / macosx / prefs.m

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 7561b6fcf840b1532b36b2617be3de0f9c275971..8cee063e8c6321a9c156518a5732f0af29dcd2fb 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -179,7 +179,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
     [o_prefs_view setHasVerticalScroller: YES];
     [o_prefs_view setDrawsBackground: NO];
     [o_prefs_view setDocumentView: o_empty_view];
-    [o_tree selectRow:0 byExtendingSelection:NO];
+       [o_tree selectRowIndexes: [NSIndexSet indexSetWithIndex: 0] byExtendingSelection: NO];
 }
 
 - (void)setTitle: (NSString *) o_title_name
@@ -194,6 +194,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
     
     [o_prefs_window center];
     [o_prefs_window makeKeyAndOrderFront:self];
+    [_rootTreeItem resetView];
 }
 
 - (void)initStrings
@@ -233,11 +234,8 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 {
     if( i_return == NSAlertAlternateReturn )
     {
-        [o_prefs_view setDocumentView: o_empty_view];
         config_ResetAll( p_intf );
         [_rootTreeItem resetView];
-        [[o_tree itemAtRow:[o_tree selectedRow]]
-            showView:o_prefs_view];
     }
 }
 
@@ -649,12 +647,16 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 
 - (void)resetView
 {
-    [_subviews release];
-    _subviews = nil;
-
     unsigned int i;
+    for( i = 0 ; i < [_subviews count] ; i++ )
+        [[_subviews objectAtIndex:i] resetValues];
+
+    for( i = 0 ; i < [_options count] ; i++ )
+        [[_options objectAtIndex:i] resetView];
+
     for( i = 0 ; i < [_children count] ; i++ )
         [[_children objectAtIndex:i] resetView];
+
 }
 
 - (NSMutableArray *)children