Commit 09ed6d81 authored by bigben's avatar bigben
Browse files

* Don't try to release NULL

* Fixes the "vlc would crash when hitting play" bug
parent 731c3c84
......@@ -40,6 +40,7 @@ void vout_OSDSlider( vlc_object_t *p_caller, int i_channel, int i_position,
{
vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( p_vout && ( config_GetInt( p_caller, "osd" ) || ( i_position >= 0 ) ) )
{
osd_Slider( p_caller, p_vout->p_spu, p_vout->render.i_width,
......@@ -56,10 +57,12 @@ void vout_OSDIcon( vlc_object_t *p_caller, int i_channel, short i_type )
{
vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
if( !p_vout ) return;
if( p_vout && config_GetInt( p_caller, "osd" ) )
{
osd_Icon( p_caller, p_vout->p_spu, p_vout->render.i_width,
p_vout->render.i_height, i_channel, i_type );
}
vlc_object_release( 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