1 files changed, 5 insertions, 0 deletions
diff --git a/src/playlist.c b/src/playlist.c
index 8be8b0553..31d2fe1b8 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -660,6 +660,11 @@ deleteASongFromPlaylist(const struct song *song)
 
 void stopPlaylist(void)
 {
+	if (!playlist.playing)
+		return;
+
+	assert(playlist.current >= 0);
+
 	g_debug("playlist: stop");
 	playerWait();
 	playlist.queued = -1;