Changeset 248d9c5273dadcce5485eb2c50bb035354451e6e

Timestamp:

14/10/07 22:21:56 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1192393316 +0000

git-parent:

[7f3af96e38437fd97b5c212715840806f46b7ca1]

git-author:

Damien Fouilleul <damienf@videolan.org> 1192393316 +0000

Message:

playlist.c: removed potential deadlock and duplicate signalling

Files:

• src/playlist/engine.c (modified) (2 diffs)
• src/playlist/thread.c (modified) (1 diff)

src/playlist/engine.c

@@ -335 +335 @@
-             {
-                msg_Dbg( p_playlist, "nothing to play" );
+                p_playlist->status.i_status = PLAYLIST_STOPPED;
+                PL_UNLOCK
+
-                if( b_playexit == VLC_TRUE )
-                {
@@ -340 +343 @@
-                    vlc_object_kill( p_playlist->p_libvlc );
-                }
-                p_playlist->status.i_status = PLAYLIST_STOPPED;
-                PL_UNLOCK
-
-                ObjectGarbageCollector( p_playlist, VLC_TRUE );
-                return;

src/playlist/thread.c

@@ -139 +139 @@
-    // Tell playlist to go to last loop
-    vlc_object_kill( p_playlist );
-    playlist_Signal( p_playlist );
-
-    // Kill preparser