Commit 8455686e authored by Rafaël Carré's avatar Rafaël Carré

Don't use the playlist if it has been destroyed

parent 58b8ff47
...@@ -509,12 +509,11 @@ static void vout_Destructor( vlc_object_t * p_this ) ...@@ -509,12 +509,11 @@ static void vout_Destructor( vlc_object_t * p_this )
#ifndef __APPLE__ #ifndef __APPLE__
vout_thread_t *p_another_vout; vout_thread_t *p_another_vout;
playlist_t *p_playlist = pl_Yield( p_vout ); playlist_t *p_playlist = vlc_object_find( p_this->p_libvlc,
if( p_playlist->b_die ) VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
{ if( !p_playlist )
pl_Release( p_vout );
return; return;
}
/* This is a dirty hack mostly for Linux, where there is no way to get the /* This is a dirty hack mostly for Linux, where there is no way to get the
* GUI back if you closed it while playing video. This is solved in * GUI back if you closed it while playing video. This is solved in
* Mac OS X, where we have this novelty called menubar, that will always * Mac OS X, where we have this novelty called menubar, that will always
...@@ -526,7 +525,7 @@ static void vout_Destructor( vlc_object_t * p_this ) ...@@ -526,7 +525,7 @@ static void vout_Destructor( vlc_object_t * p_this )
var_SetBool( p_playlist, "intf-show", true ); var_SetBool( p_playlist, "intf-show", true );
else else
vlc_object_release( p_another_vout ); vlc_object_release( p_another_vout );
pl_Release( p_vout ); vlc_object_release( p_playlist );
#endif #endif
} }
......
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