[vlc-devel] commit: libvlc: Destroy libvlc' s vlm instance before the stats destruction to avoid input crashes. ( Pierre d'Herbemont )
git version control
git at videolan.org
Mon Mar 31 01:12:32 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Mon Mar 31 01:07:45 2008 +0200| [e002f487c3fcb22f27b7e2614f9a0b02dfc524f0]
libvlc: Destroy libvlc's vlm instance before the stats destruction to avoid input crashes.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e002f487c3fcb22f27b7e2614f9a0b02dfc524f0
---
src/libvlc-common.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index d2777ac..2b981f5 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -970,6 +970,12 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
aout_Delete( p_aout );
}
+ /* Destroy VLM if created in libvlc_InternalInit */
+ if( p_libvlc->p_vlm )
+ {
+ vlm_Delete( p_libvlc->p_vlm );
+ }
+
/* Free interaction */
msg_Dbg( p_libvlc, "removing interaction" );
vlc_object_release( p_libvlc->p_interaction );
@@ -998,12 +1004,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
vlc_mutex_destroy( &p_libvlc->p_stats->lock );
FREENULL( p_libvlc->p_stats );
- /* Destroy VLM if created in libvlc_InternalInit */
- if( p_libvlc->p_vlm )
- {
- vlm_Delete( p_libvlc->p_vlm );
- }
-
return VLC_SUCCESS;
}
More information about the vlc-devel
mailing list