playlist: fix assertion when last/current song is deleted

When MPD is stopped, but the last song is still the "current song", and you delete it, playlist->current is not updated, and becomes an invalid value. Fix this by catching "!playlist->playing && playlist->current == (int)songOrder".

playlist: fix assertion when last/current song is deleted
34244398 · Max Kellermann · e8787ac4 · 34244398
Commit 34244398 authored Feb 10, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

playlist_edit.c src/playlist_edit.c +4 -1

No files found.
--- a/src/playlist_edit.c
+++ b/src/playlist_edit.c
@@ -243,7 +243,10 @@ deleteFromPlaylist(struct playlist *playlist, unsigned song)
 			stopPlaylist(playlist);
 		queued = NULL;
-	}
+	} else if (playlist->current == (int)songOrder)
+		/* there's a "current song" but we're not playing
+		   currently - clear "current" */
+		playlist->current = -1;
 	/* now do it: remove the song */