[vlc-commits] playlist: allow playlist_Stop() on a killed playlist

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 26 19:57:46 2012 +0200| [19c49bbc873de0f124eba7722a459cd299e83c07] | committer: Rémi Denis-Courmont

playlist: allow playlist_Stop() on a killed playlist

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19c49bbc873de0f124eba7722a459cd299e83c07
---

 src/playlist/control.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/playlist/control.c b/src/playlist/control.c
index c01643b..4419ba7 100644
--- 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 )
     {