oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'release-0.18.10'

Browse Source
This commit is contained in:
Max Kellermann
2014-04-10 13:49:20 +02:00
parent afdefefbe4 d0119548c1
commit 1c02b4b9f4
5 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/queue/PlaylistEdit.cxx
View File

@@ -204,12 +204,8 @@ playlist::DeleteInternal(PlayerControl &pc,
if (playing && current == (int)songOrder) {
const bool paused = pc.GetState() == PlayerState::PAUSE;
/* the current song is going to be deleted: stop the player */
pc.Stop();
playing = false;
/* see which song is going to be played instead */
/* the current song is going to be deleted: see which
song is going to be played instead */
current = queue.GetNextOrder(current);
if (current == (int)songOrder)
@@ -218,10 +214,12 @@ playlist::DeleteInternal(PlayerControl &pc,
if (current >= 0 && !paused)
/* play the song after the deleted one */
PlayOrder(pc, current);
else
/* no songs left to play, stop playback
completely */
Stop(pc);
else {
/* stop the player */
pc.Stop();
playing = false;
}
*queued_p = nullptr;
} else if (current == (int)songOrder)