From 276843edd5033e6dd4a708d3a8bbc29a6bfafc92 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 23 Jan 2009 16:17:21 +0100 Subject: [PATCH] playlist: don't unpause on delete When you delete a song from the playlist which was paused, MPD forgot that it was paused and started playing the next song. --- NEWS | 1 + src/playlist.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 257343672..0575b6cc7 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,7 @@ ver 0.15 - (200?/??/??) * --create-db starts the MPD daemon instead of exiting * playlist_directory and music_directory are optional * playlist: recalculate the queued song after random is toggled +* playlist: don't unpause on delete ver 0.14.1 (2009/01/17) diff --git a/src/playlist.c b/src/playlist.c index 61c02f916..49e5cc672 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -647,6 +647,8 @@ enum playlist_result deleteFromPlaylist(unsigned song) clearPlayerQueue(); if (playlist.playing && playlist.current == (int)songOrder) { + bool paused = getPlayerState() == PLAYER_STATE_PAUSE; + /* the current song is going to be deleted: stop the player */ playerWait(); @@ -658,7 +660,7 @@ enum playlist_result deleteFromPlaylist(unsigned song) if (playlist.current == (int)songOrder) playlist.current = -1; - if (playlist.current >= 0) + if (playlist.current >= 0 && !paused) /* play the song after the deleted one */ playPlaylistOrderNumber(playlist.current); else