* modules/video_output/directx/directx.c,glwin32.c: revert backport of 13050 for...

[vlc] / src / video_output / video_widgets.c

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 0b7798c12313af25069c24adc4e43eb87644ad66..2db96e603aa4cedff8b4f978333ef1c105f4779f 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -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,14 @@ 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 && config_GetInt( p_caller, "osd" ) )
+
+    if( !p_vout ) return;
+
+    if( 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 );
 }
+