Commit 75df75b6 authored by Gildas Bazin's avatar Gildas Bazin

* interface/interface.c: fixed a bug with embedded vouts and interface switching.

* video_output/vout_intf.c: small fix.
parent a748c625
...@@ -319,11 +319,15 @@ static void RunInterface( intf_thread_t *p_intf ) ...@@ -319,11 +319,15 @@ static void RunInterface( intf_thread_t *p_intf )
/* Provide ability to switch the main interface on the fly */ /* Provide ability to switch the main interface on the fly */
psz_intf = p_intf->psz_switch_intf; psz_intf = p_intf->psz_switch_intf;
p_intf->psz_switch_intf = NULL; p_intf->psz_switch_intf = NULL;
p_intf->b_die = VLC_FALSE;
/* Make sure the old interface is completely uninitialized */ /* Make sure the old interface is completely uninitialized */
module_Unneed( p_intf, p_intf->p_module ); module_Unneed( p_intf, p_intf->p_module );
vlc_mutex_lock( &p_intf->object_lock );
p_intf->b_die = VLC_FALSE;
p_intf->b_dead = VLC_FALSE;
vlc_mutex_unlock( &p_intf->object_lock );
p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 ); p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
free( psz_intf ); free( psz_intf );
} }
......
...@@ -151,7 +151,6 @@ int vout_ControlWindow( vout_thread_t *p_vout, void *p_window, ...@@ -151,7 +151,6 @@ int vout_ControlWindow( vout_thread_t *p_vout, void *p_window,
{ {
msg_Err( p_vout, "no pf_control_window"); msg_Err( p_vout, "no pf_control_window");
vlc_mutex_unlock( &p_intf->object_lock ); vlc_mutex_unlock( &p_intf->object_lock );
vlc_object_release( p_intf );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
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