Skip to content

V
vlc
Commit 6f3acaad authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix double vlc_object_attach().

parent 1bc8330a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/osd/osd.c
View file @ 6f3acaad
...@@ -66,7 +66,8 @@ static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file ) ...@@ -66,7 +66,8 @@ static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file )
msg_Err( p_this, "out of memory" ); msg_Err( p_this, "out of memory" );
return NULL; return NULL;
} }
vlc_object_attach( p_this, p_menu ); vlc_object_yield( p_menu );
vlc_object_attach( p_menu, p_this->p_libvlc );
/* Stuff needed for Parser */ /* Stuff needed for Parser */
p_menu->psz_file = strdup( psz_file ); p_menu->psz_file = strdup( psz_file );
...@@ -156,9 +157,6 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) ...@@ -156,9 +157,6 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
osd_UpdateState( p_osd->p_state, p_osd->i_x, p_osd->i_y, osd_UpdateState( p_osd->p_state, p_osd->i_x, p_osd->i_y,
p_osd->i_width, p_osd->i_height, NULL ); p_osd->i_width, p_osd->i_height, NULL );
vlc_object_yield( p_osd );
vlc_object_attach( p_osd, p_this->p_libvlc );
/* Signal when an update of OSD menu is needed */ /* Signal when an update of OSD menu is needed */
var_Create( p_osd, "osd-menu-update", VLC_VAR_BOOL ); var_Create( p_osd, "osd-menu-update", VLC_VAR_BOOL );
var_Create( p_osd, "osd-menu-visible", VLC_VAR_BOOL ); var_Create( p_osd, "osd-menu-visible", VLC_VAR_BOOL );
......
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