playlist: allow playlist_Stop() on a killed playlist

diff --git a/src/playlist/control.c b/src/playlist/control.c
index c01643b2c16f06baad565f67273870c9be641fad..4419ba710689dcb077cfb973a92d310ac53d0a51 100644 (file)
--- 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 )
-        return VLC_EGENERIC;
-
-    if( playlist_IsEmpty( p_playlist ) && i_query != PLAYLIST_STOP )
-        return VLC_EGENERIC;
+    if( i_query != PLAYLIST_STOP )
+        if( pl_priv(p_playlist)->killed || playlist_IsEmpty( p_playlist ) )
+            return VLC_EGENERIC;
 
     switch( i_query )
     {