Remove pl_Get. This endorsed unyielded playlist access.

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index b9516d29a5e433dd1bb6ee6ee78f62e9e1e53e19..78eef306287d073d4c036d980353b1586c6749b4 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -509,26 +509,24 @@ static void vout_Destructor( vlc_object_t * p_this )
 #ifndef __APPLE__
     vout_thread_t *p_another_vout;
 
-    playlist_t *p_playlist = pl_Get( p_vout );
-    if( p_playlist->b_die ) return;
-    vlc_object_yield( p_playlist );
-/* This is a dirty hack for mostly 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 allow you access
-   to the applications main functionality. They should try that on linux sometime */
-        p_another_vout = vlc_object_find( p_this->p_libvlc,
-                                          VLC_OBJECT_VOUT, FIND_ANYWHERE );
-        if( p_another_vout == NULL )
-        {
-            vlc_value_t val;
-            val.b_bool = true;
-            var_Set( p_playlist, "intf-show", val );
+    playlist_t *p_playlist = pl_Yield( p_vout );
+    if( p_playlist->b_die )
+    {
+        pl_Release( p_vout );
+        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
+     * allow you access to the applications main functionality. They should try
+     * that on linux sometime. */
+    p_another_vout = vlc_object_find( p_this->p_libvlc,
+                                      VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    if( p_another_vout == NULL )
+        var_SetBool( p_playlist, "intf-show", true );
     else
-    {
         vlc_object_release( p_another_vout );
-    }
-    vlc_object_release( p_playlist );
+    pl_Release( p_vout );
 #endif
 }