* src/input/input.c: Really fixed :programs= this time.

diff --git a/src/input/input.c b/src/input/input.c
index 452cb9c779b9e3ad78d7a2e79d5b9000bd3b3cf7..849ef305c34980d8a3ba67847b4d0013b3c42651 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2340,7 +2340,11 @@ static void ParseOption( input_thread_t *p_input, const char *psz_option )
     psz_name = strndup( psz_name, i_name_len );
     if( psz_value ) psz_value++;
 
-    i_type = config_GetType( p_input, psz_name );
+    /* FIXME: :programs should be handled generically */
+    if( !strcmp( psz_name, "programs" ) )
+        i_type = VLC_VAR_LIST;
+    else
+        i_type = config_GetType( p_input, psz_name );
 
     if( !i_type && !psz_value )
     {
@@ -2402,16 +2406,16 @@ static void ParseOption( input_thread_t *p_input, const char *psz_option )
         while( psz_var && *psz_var )
         {
             char *psz_item = psz_var;
-            vlc_value_t val;
+            vlc_value_t val2;
             while( *psz_var && *psz_var != ',' ) psz_var++;
             if( *psz_var == ',' )
             {
                 *psz_var = '\0';
                 psz_var++;
             }
-            val.i_int = strtol( psz_item, NULL, 0 );
+            val2.i_int = strtol( psz_item, NULL, 0 );
             INSERT_ELEM( p_list->p_values, p_list->i_count,
-                         p_list->i_count, val );
+                         p_list->i_count, val2 );
             /* p_list->i_count is incremented twice by INSERT_ELEM */
             p_list->i_count--;
             INSERT_ELEM( p_list->pi_types, p_list->i_count,