Skip to content

V
vlc-1.1
Commit 1d536ab9 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

hotkeys: fix memleak with var_Change(VLC_VAR_GETCHOICES).

parent aeb955d8
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
modules/control/hotkeys.c
View file @ 1d536ab9
...@@ -387,6 +387,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -387,6 +387,8 @@ static void Run( intf_thread_t *p_intf )
_("Audio Device: %s"), _("Audio Device: %s"),
list2.p_list->p_values[i].psz_string); list2.p_list->p_values[i].psz_string);
} }
var_Change( p_aout, "audio-device", VLC_VAR_FREELIST, &list,
&list2 );
} }
/* Input options */ /* Input options */
else if( p_input ) else if( p_input )
...@@ -478,6 +480,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -478,6 +480,8 @@ static void Run( intf_thread_t *p_intf )
_("Audio track: %s"), _("Audio track: %s"),
list2.p_list->p_values[i].psz_string ); list2.p_list->p_values[i].psz_string );
} }
var_Change( p_input, "audio-es", VLC_VAR_FREELIST, &list,
&list2 );
} }
else if( i_action == ACTIONID_SUBTITLE_TRACK ) else if( i_action == ACTIONID_SUBTITLE_TRACK )
{ {
...@@ -492,6 +496,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -492,6 +496,8 @@ static void Run( intf_thread_t *p_intf )
{ {
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Subtitle track: %s"), _("N/A") ); _("Subtitle track: %s"), _("N/A") );
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
&list2 );
continue; continue;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
...@@ -516,6 +522,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -516,6 +522,8 @@ static void Run( intf_thread_t *p_intf )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Subtitle track: %s"), _("Subtitle track: %s"),
list2.p_list->p_values[i].psz_string ); list2.p_list->p_values[i].psz_string );
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
&list2 );
} }
else if( i_action == ACTIONID_ASPECT_RATIO && p_vout ) else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment