Fixed a segfault in aout_EnableFilter.

[vlc] / src / osd / osd.c

diff --git a/src/osd/osd.c b/src/osd/osd.c
index b36d4a5a6a5a6206118b7ea56b935e50242fcd06..97ade75c2b917c16f4d38c9c587be1d9e3069bad 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -73,7 +73,7 @@ static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file )
                                 osdmenu_name );
     if( !p_menu )
         return NULL;
-    vlc_object_yield( p_menu );
+
     vlc_object_attach( p_menu, p_this->p_libvlc );
 
     /* Stuff needed for Parser */
@@ -706,9 +706,9 @@ void __osd_Volume( vlc_object_t *p_this )
             osd_SetMenuUpdate( p_osd, true );
             osd_SetMenuVisible( p_osd, true );
         }
-        vlc_object_release( (vlc_object_t*) p_osd );
         vlc_mutex_unlock( lockval.p_address );
     }
+    vlc_object_release( p_osd );
 }
 
 osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
@@ -728,7 +728,7 @@ osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
 
     if( osd_isVisible( p_osd ) == false )
     {
-        vlc_object_release( (vlc_object_t*) p_osd );
+        vlc_object_release( p_osd );
         return NULL;
     }
 
@@ -781,13 +781,13 @@ osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
         if( ( i_x >= i_x_offset ) && ( i_x <= i_x_offset + i_width ) &&
             ( i_y >= i_y_offset ) && ( i_y <= i_y_offset + i_height ) )
         {
-            vlc_object_release( (vlc_object_t*) p_osd );
+            vlc_object_release( p_osd );
             vlc_mutex_unlock( lockval.p_address );
             return p_button;
         }
     }
 
-    vlc_object_release( (vlc_object_t*) p_osd );
+    vlc_object_release( p_osd );
     vlc_mutex_unlock( lockval.p_address );
     return NULL;
 }
@@ -839,6 +839,6 @@ void __osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button )
     msg_Dbg( p_osd, "button selected is [button %s]", p_osd->p_state->p_visible->psz_action );
 #endif
 
-    vlc_object_release( (vlc_object_t*) p_osd );
+    vlc_object_release( p_osd );
     vlc_mutex_unlock( lockval.p_address );
 }