Skip to content

V
vlc-1.1
Commit 8e7cf631 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Fix refcount problems

parent 31ce5588
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
modules/control/hotkeys.c
View file @ 8e7cf631
......@@ -206,8 +206,15 @@ static void Run( intf_thread_t *p_intf )
/* Update the input */
if( p_intf->p_sys->p_input == NULL )
{
p_intf->p_sys->p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
{
p_intf->p_sys->p_input = p_playlist->p_input;
if( p_intf->p_sys->p_input )
vlc_object_yield( p_intf->p_sys->p_input );
vlc_object_release( p_playlist );
}
}
else if( p_intf->p_sys->p_input->b_dead )
{
......
modules/gui/skins2/src/vlcproc.cpp
View file @ 8e7cf631
......@@ -240,8 +240,9 @@ void VlcProc::manage()
// Update the input
if( getIntf()->p_sys->p_input == NULL )
{
getIntf()->p_sys->p_input = (input_thread_t *)vlc_object_find(
getIntf(), VLC_OBJECT_INPUT, FIND_ANYWHERE );
getIntf()->p_sys->p_input = getIntf()->p_sys->p_playlist->p_input;
if( getIntf()->p_sys->p_input )
vlc_object_yield( getIntf()->p_sys->p_input );
}
else if( getIntf()->p_sys->p_input->b_dead )
{
......
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