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

queue/PlaylistEdit: check "current>=0" before updating it

Browse Source
This commit is contained in:
Max Kellermann 2021-02-15 19:36:59 +01:00
parent ecc07e4e98
commit ab160aa359
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/queue/PlaylistEdit.cxx
View File

@ -141,12 +141,12 @@ playlist::SwapPositions(PlayerControl &pc, unsigned song1, unsigned song2)
queue.SwapOrders(queue.PositionToOrder(song1), queue.SwapOrders(queue.PositionToOrder(song1),
queue.PositionToOrder(song2)); queue.PositionToOrder(song2));
} else { } else if (current >= 0){
/* correct the "current" song order */ /* correct the "current" song order */
if (current == (int)song1) if (unsigned(current) == song1)
current = song2; current = song2;
else if (current == (int)song2) else if (unsigned(current) == song2)
current = song1; current = song1;
} }
@ -357,13 +357,15 @@ playlist::MoveRange(PlayerControl &pc,
queue.MoveRange(start, end, to); queue.MoveRange(start, end, to);
if (!queue.random) { if (!queue.random && current >= 0) {
/* update current/queued */ /* update current */
if ((int)start <= current && (unsigned)current < end) if (start <= unsigned(current) && unsigned(current) < end)
current += to - start; current += unsigned(to) - start;
else if (current >= (int)end && current <= to) else if (unsigned(current) >= end &&
unsigned(current) <= unsigned(to))
current -= end - start; current -= end - start;
else if (current >= to && current < (int)start) else if (unsigned(current) >= unsigned(to) &&
unsigned(current) < start)
current += end - start; current += end - start;
} }