* modules/gui/macosx/playlist.?:

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

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 6b41bc431d93f982cb3bd200cc0dd24186acfdba..c4dd476c8458f98cd95a3ea1629b7e8b5392ab65 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * prefs.m: MacOS X plugin for vlc
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: prefs.m,v 1.15 2003/02/21 02:45:21 hartman Exp $
+ * Copyright (C) 2002-2003 VideoLAN
+ * $Id: prefs.m,v 1.17 2003/03/06 10:15:37 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *
@@ -236,8 +236,11 @@
         [o_text_field setBordered: NO]; \
         [o_text_field setEditable: NO]; \
         [o_text_field setSelectable: NO]; \
-        [o_text_field setStringValue: \
-            [NSApp localizedString: label]]; \
+        if ( label ) \
+        { \
+            [o_text_field setStringValue: \
+                [NSApp localizedString: label]]; \
+        } \
         [o_text_field sizeToFit]; \
         [o_view addSubview: [o_text_field autorelease]]; \
     }
@@ -280,7 +283,7 @@
 
     if( p_item ) do
     {
-        if( p_item->b_advanced && !config_GetInt( p_intf, "advanced" ))
+        if( p_item->b_advanced && !config_GetInt( p_intf, "advanced" ) )
         {
             continue;
         }
@@ -728,7 +731,7 @@
 {
     id o_vlc_control;
     NSEnumerator *o_enum;
-    BOOL b_advanced_change = FALSE;
+    BOOL b_adv_change = FALSE;
     
     NSWindow *o_pref_panel = [[sender superview] window];
     NSString *o_module_name = [[o_pref_panel toolbar] identifier];
@@ -762,7 +765,7 @@
                     psz_value = (char *)[o_value lossyCString];
     
                     config_PutPsz( p_intf, psz_name,
-                                *psz_value ? psz_value : NULL );
+                                   *psz_value ? psz_value : NULL );
                 }
                 break;
     
@@ -770,10 +773,13 @@
             case CONFIG_ITEM_BOOL:
                 {
                     int i_value = [o_vlc_control intValue];
-                    if ( !strcmp( psz_name, "advanced" ) && ( config_GetInt( p_intf, "advanced" ) != i_value ) )
+
+                    if( !strcmp( psz_name, "advanced" ) && 
+                        ( config_GetInt( p_intf, "advanced" ) != i_value ) )
                     {
-                        b_advanced_change = TRUE;
+                        b_adv_change = TRUE;
                     }
+
                     config_PutInt( p_intf, psz_name, i_value );
                 }
                 break;
@@ -795,11 +801,7 @@
         config_SaveConfigFile( p_intf, NULL );
     }
     
-    if ( [[sender title] isEqualToString: _NS("Apply")] && !b_advanced_change )
-    {
-        ;
-    }
-    else
+    if( ![[sender title] isEqualToString: _NS("Apply")] || b_adv_change )
     {
         [o_pref_panel close];
 
@@ -809,10 +811,6 @@
             [self performSelectorOnMainThread: @selector(destroyPrefPanel:)
                                             withObject: o_module_name
                                             waitUntilDone: YES];
-            if ( [[sender title] isEqualToString: _NS("Apply")] && b_advanced_change )
-            {
-                [self createPrefPanel:@"main"];
-            }
         }
         else
         {
@@ -820,6 +818,11 @@
                     target: self selector: @selector(destroyPrefPanel:)
                     userInfo: o_module_name repeats: NO];
         }
+
+        if( [[sender title] isEqualToString: _NS("Apply")] && b_adv_change )
+        {
+            [self createPrefPanel: o_module_name];
+        }
     }
 }