Commit adee2d26 authored by Rafaël Carré's avatar Rafaël Carré

Do not crash in vout destruction when exiting

parent 9d2636c5
...@@ -508,19 +508,21 @@ static void vout_Destructor( vlc_object_t * p_this ) ...@@ -508,19 +508,21 @@ 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 = pl_Get( p_vout );
/* This is a dirty hack for mostly Linux, where there is no way to get the GUI if( p_playlist->b_die ) return;
back if you closed it while playing video. This is solved in Mac OS X, vlc_object_yield( p_playlist );
where we have this novelty called menubar, that will always allow you access /* This is a dirty hack for mostly Linux, where there is no way to get the GUI
to the applications main functionality. They should try that on linux sometime */ back if you closed it while playing video. This is solved in Mac OS X,
p_another_vout = vlc_object_find( p_this->p_libvlc, where we have this novelty called menubar, that will always allow you access
VLC_OBJECT_VOUT, FIND_ANYWHERE ); to the applications main functionality. They should try that on linux sometime */
if( p_another_vout == NULL ) p_another_vout = vlc_object_find( p_this->p_libvlc,
{ VLC_OBJECT_VOUT, FIND_ANYWHERE );
vlc_value_t val; if( p_another_vout == NULL )
val.b_bool = VLC_TRUE; {
var_Set( p_playlist, "intf-show", val ); vlc_value_t val;
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-show", val );
} }
else else
{ {
......
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