Changeset f8c1e19a7b7fc98dd25beae22a172895964e3d2d

Show
Ignore:
Timestamp:
11/14/07 16:18:19 (10 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1195053499 +0000
git-parent:

[099b560c5b3f79b33bd9c22060a76bb0e066499a]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1195053499 +0000
Message:

Detach osdmenu object before destroying.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/osd/osd.c

    rb08b5f5 rf8c1e19  
    101101static void osd_ParserUnload( vlc_object_t *p_this, osd_menu_t *p_menu ) 
    102102{ 
    103     if( p_menu->p_parser ) 
    104     { 
    105         module_Unneed( p_menu, p_menu->p_parser ); 
    106     } 
    107     p_menu->p_parser = NULL; 
    108  
    109103    if( p_menu->p_image ) 
    110104        image_HandlerDelete( p_menu->p_image ); 
    …… 
    112106        free( p_menu->psz_file ); 
    113107 
     108    if( p_menu->p_parser ) 
     109        module_Unneed( p_menu, p_menu->p_parser ); 
     110 
    114111    vlc_object_detach( p_menu ); 
    115112    vlc_object_destroy( p_menu ); 
    116     p_menu = NULL; 
    117113} 
    118114 
    …… 
    183179        free( p_osd->psz_file ); 
    184180 
    185     vlc_mutex_unlock( lockval.p_address ); 
     181    vlc_object_detach( p_osd ); 
    186182    vlc_object_destroy( p_osd ); 
    187183    vlc_mutex_unlock( lockval.p_address ); 
    …… 
    209205 
    210206    osd_ParserUnload( p_this, p_osd ); 
    211  
     207    p_osd = NULL; 
    212208    vlc_mutex_unlock( lockval.p_address ); 
    213209}