Skip to content

M
mpd
Commit 276843ed authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent 032640f9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
NEWS
View file @ 276843ed
...@@ -29,6 +29,7 @@ ver 0.15 - (200?/??/??) ...@@ -29,6 +29,7 @@ ver 0.15 - (200?/??/??)
* --create-db starts the MPD daemon instead of exiting * --create-db starts the MPD daemon instead of exiting
* playlist_directory and music_directory are optional * playlist_directory and music_directory are optional
* playlist: recalculate the queued song after random is toggled * playlist: recalculate the queued song after random is toggled
* playlist: don't unpause on delete
ver 0.14.1 (2009/01/17) ver 0.14.1 (2009/01/17)
......
src/playlist.c
View file @ 276843ed
...@@ -647,6 +647,8 @@ enum playlist_result deleteFromPlaylist(unsigned song) ...@@ -647,6 +647,8 @@ enum playlist_result deleteFromPlaylist(unsigned song)
clearPlayerQueue(); clearPlayerQueue();
if (playlist.playing && playlist.current == (int)songOrder) { if (playlist.playing && playlist.current == (int)songOrder) {
bool paused = getPlayerState() == PLAYER_STATE_PAUSE;
/* the current song is going to be deleted: stop the player */ /* the current song is going to be deleted: stop the player */
playerWait(); playerWait();
...@@ -658,7 +660,7 @@ enum playlist_result deleteFromPlaylist(unsigned song) ...@@ -658,7 +660,7 @@ enum playlist_result deleteFromPlaylist(unsigned song)
if (playlist.current == (int)songOrder) if (playlist.current == (int)songOrder)
playlist.current = -1; playlist.current = -1;
if (playlist.current >= 0) if (playlist.current >= 0 && !paused)
/* play the song after the deleted one */ /* play the song after the deleted one */
playPlaylistOrderNumber(playlist.current); playPlaylistOrderNumber(playlist.current);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment