From: Rémi Duraffort <ivoire@videolan.org>
Date: Tue, 26 May 2009 10:58:18 +0000 (+0200)
Subject: Merge branch '1.0-bugfix'
X-Git-Tag: 1.1.0-ff~5756
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=14f37b2101842fa6e427f962f689db74eff6faba;p=vlc

Merge branch '1.0-bugfix'
---

14f37b2101842fa6e427f962f689db74eff6faba
diff --cc modules/control/gestures.c
index ba41860a5f,5c117905c5..93b7a9edb8
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@@ -316,20 -316,22 +316,21 @@@ static void RunIntf( intf_thread_t *p_i
                      if( !p_input )
                          break;
  
-                    var_Get( p_input, "audio-es", &val );
-                    var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
-                                &list, &list2 );
-                    i_count = list.p_list->i_count;
-                    if( i_count <= 1 )
-                    {
-                        vlc_object_release( p_input );
-                        break;
-                    }
-                    for( i = 0; i < i_count; i++ )
-                    {
-                        if( val.i_int == list.p_list->p_values[i].i_int )
-                            break;
-                    }
+                     var_Get( p_input, "audio-es", &val );
+                     var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
+                                 &list, &list2 );
+                     i_count = list.p_list->i_count;
+                     if( i_count <= 1 )
+                     {
 -                        var_Change( p_input, "audio-es", VLC_VAR_FREELIST, &list,
 -                                    &list2 );
++                        var_FreeList( &list, &list2 );
+                         vlc_object_release( p_input );
+                         break;
+                     }
+                     for( i = 0; i < i_count; i++ )
+                     {
+                         if( val.i_int == list.p_list->p_values[i].i_int )
+                             break;
+                     }
                      /* value of audio-es was not in choices list */
                      if( i == i_count )
                      {
@@@ -342,6 -344,8 +343,7 @@@
                      else
                          i++;
                      var_Set( p_input, "audio-es", list.p_list->p_values[i] );
 -                    var_Change( p_input, "audio-es", VLC_VAR_FREELIST, &list,
 -                                &list2 );
++                    var_FreeList( &list, &list2 );
                      vlc_object_release( p_input );
                  }
                  break;
@@@ -365,6 -369,8 +367,7 @@@
                      if( i_count <= 1 )
                      {
                          vlc_object_release( p_input );
 -                        var_Change( p_input, "spu-es", VLC_VAR_FREELIST,
 -                                    &list, &list2 );
++                        var_FreeList( &list, &list2 );
                          break;
                      }
                      for( i = 0; i < i_count; i++ )
@@@ -386,6 -392,8 +389,7 @@@
                      else
                          i++;
                      var_Set( p_input, "spu-es", list.p_list->p_values[i] );
 -                    var_Change( p_input, "spu-es", VLC_VAR_FREELIST,
 -                                &list, &list2 );
++                    var_FreeList( &list, &list2 );
                      vlc_object_release( p_input );
                  }
                  break;
diff --cc modules/control/hotkeys.c
index 7ecd115879,9c2c1c305f..4447e17731
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@@ -387,6 -381,8 +381,7 @@@ static void Run( intf_thread_t *p_intf 
                          _("Audio Device: %s"),
                          list2.p_list->p_values[i].psz_string);
              }
 -            var_Change( p_aout, "audio-device", VLC_VAR_FREELIST, &list,
 -                        &list2 );
++            var_FreeList( &list, &list2 );
          }
          /* Input options */
          else if( p_input )
@@@ -478,6 -474,8 +473,7 @@@
                                       _("Audio track: %s"),
                                       list2.p_list->p_values[i].psz_string );
                  }
 -                var_Change( p_input, "audio-es", VLC_VAR_FREELIST, &list,
 -                            &list2 );
++                var_FreeList( &list, &list2 );
              }
              else if( i_action == ACTIONID_SUBTITLE_TRACK )
              {
@@@ -492,7 -490,9 +488,8 @@@
                  {
                      vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                       _("Subtitle track: %s"), _("N/A") );
-                     continue;
 -                    var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
 -                                &list2 );
++                    var_FreeList( &list, &list2 );
+                     goto cleanup_and_continue;
                  }
                  for( i = 0; i < i_count; i++ )
                  {
@@@ -516,6 -516,8 +513,7 @@@
                  vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                   _("Subtitle track: %s"),
                                   list2.p_list->p_values[i].psz_string );
 -                var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
 -                            &list2 );
++                var_FreeList( &list, &list2 );
              }
              else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
              {