[vlc-devel] commit: Don't use the playlist if it has been destroyed ( Rafaël Carré )
git version control
git at videolan.org
Thu May 8 11:54:50 CEST 2008
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu May 8 11:55:45 2008 +0200| [8455686e2c80234087a520b89c32992aab631250]
Don't use the playlist if it has been destroyed
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8455686e2c80234087a520b89c32992aab631250
---
src/video_output/video_output.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 78eef30..d71fb1f 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -509,12 +509,11 @@ static void vout_Destructor( vlc_object_t * p_this )
#ifndef __APPLE__
vout_thread_t *p_another_vout;
- playlist_t *p_playlist = pl_Yield( p_vout );
- if( p_playlist->b_die )
- {
- pl_Release( p_vout );
+ playlist_t *p_playlist = vlc_object_find( p_this->p_libvlc,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( !p_playlist )
return;
- }
+
/* 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
* 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 )
var_SetBool( p_playlist, "intf-show", true );
else
vlc_object_release( p_another_vout );
- pl_Release( p_vout );
+ vlc_object_release( p_playlist );
#endif
}
More information about the vlc-devel
mailing list