playlist: allow playlist_Stop() on a killed playlist

19c49bbc · Rémi Denis-Courmont · c3852ac6 · 19c49bbc
Commit 19c49bbc authored Nov 26, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

src/playlist/control.c src/playlist/control.c +3 -5

No files found.
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -107,11 +107,9 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
    PL_ASSERT_LOCKED;
-    if( pl_priv(p_playlist)->killed )
+    if( i_query != PLAYLIST_STOP )
-        return VLC_EGENERIC;
+        if( pl_priv(p_playlist)->killed || playlist_IsEmpty( p_playlist ) )
+            return VLC_EGENERIC;
-    if( playlist_IsEmpty( p_playlist ) && i_query != PLAYLIST_STOP )
-        return VLC_EGENERIC;
    switch( i_query )
    {