Commit 1d6f5ed5 authored by Mirsal Ennaime's avatar Mirsal Ennaime

Telepathy: Fix a crash.

parent 83e5162f
...@@ -144,14 +144,10 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -144,14 +144,10 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
char *psz_artist = NULL; char *psz_artist = NULL;
char *psz_album = NULL; char *psz_album = NULL;
char *psz_arturl = NULL; char *psz_arturl = NULL;
input_thread_t *p_input = NULL; input_thread_t *p_input = ((playlist_t*) p_this)->p_input;
playlist_t * p_playlist = pl_Yield( p_this );
intf_thread_t *p_intf = ( intf_thread_t* ) param; intf_thread_t *p_intf = ( intf_thread_t* ) param;
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
p_input = p_playlist->p_input;
pl_Release( p_this );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
......
...@@ -169,6 +169,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -169,6 +169,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
{ {
VLC_UNUSED(oldval); VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t *)param; intf_thread_t *p_intf = (intf_thread_t *)param;
playlist_t* p_playlist = (playlist_t*) p_this;
char *psz_buf = NULL; char *psz_buf = NULL;
input_thread_t *p_input; input_thread_t *p_input;
...@@ -193,11 +194,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -193,11 +194,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
p_intf->p_sys->i_item_changes++; p_intf->p_sys->i_item_changes++;
} }
playlist_t *p_playlist = pl_Yield( p_this );
p_input = p_playlist->p_input; p_input = p_playlist->p_input;
pl_Release( p_this );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
...@@ -219,7 +216,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -219,7 +216,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
var_AddCallback( p_input, "state", StateChange, p_intf ); var_AddCallback( p_input, "state", StateChange, p_intf );
/* We format the string to be displayed */ /* We format the string to be displayed */
psz_buf = str_format_meta( p_this, p_intf->p_sys->psz_format ); psz_buf = str_format_meta( (vlc_object_t*) p_intf,
p_intf->p_sys->psz_format );
/* We don't need the input anymore */ /* We don't need the input anymore */
vlc_object_release( p_input ); vlc_object_release( p_input );
......
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