From fbd86409a420fb3f62500e6b10f506d7698c679d Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Thu, 17 Jul 2008 23:06:01 +0200 Subject: [PATCH] vout: Make sure vout_Close() has been called before the object destruction. --- src/video_output/video_output.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index e0837c6bb4..4b0744ed25 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -463,6 +463,7 @@ void vout_Close( vout_thread_t *p_vout ) vlc_object_kill( p_vout ); vlc_thread_join( p_vout ); module_Unneed( p_vout, p_vout->p_module ); + p_vout->p_module = NULL; } /* */ @@ -470,6 +471,9 @@ static void vout_Destructor( vlc_object_t * p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; + /* Make sure the vout was stopped first */ + assert( !p_vout->p_module ); + /* Destroy the locks */ vlc_mutex_destroy( &p_vout->picture_lock ); vlc_mutex_destroy( &p_vout->change_lock ); -- 2.39.2