Skip to content

V
vlc-2-2
Commit 128bfa77 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

hotkeys: fix a big object leak and factorize a bit.

parent 1d536ab9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
modules/control/hotkeys.c
View file @ 128bfa77
...@@ -207,13 +207,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -207,13 +207,7 @@ static void Run( intf_thread_t *p_intf )
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
if( p_aout ) goto cleanup_and_continue;
vlc_object_release( p_aout );
if( p_vout )
vlc_object_release( p_vout );
if( p_input )
vlc_object_release( p_input );
continue;
} }
/* Volume and audio actions */ /* Volume and audio actions */
else if( i_action == ACTIONID_VOL_UP ) else if( i_action == ACTIONID_VOL_UP )
...@@ -498,7 +492,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -498,7 +492,7 @@ static void Run( intf_thread_t *p_intf )
_("Subtitle track: %s"), _("N/A") ); _("Subtitle track: %s"), _("N/A") );
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
&list2 ); &list2 );
continue; goto cleanup_and_continue;
} }
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
...@@ -883,6 +877,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -883,6 +877,7 @@ static void Run( intf_thread_t *p_intf )
} }
} }
} }
cleanup_and_continue:
if( p_aout ) if( p_aout )
vlc_object_release( p_aout ); vlc_object_release( p_aout );
if( p_vout ) if( 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