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.

playlist: don't unpause on delete
276843ed · Max Kellermann · 032640f9 · 276843ed · 276843ed
Commit 276843ed authored Jan 23, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

NEWS NEWS +1 -0

playlist.c src/playlist.c +3 -1

No files found.
--- 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)

--- 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