queue/PlaylistEdit: fix relative destination offset when moving a range

Commit 13208bf5 added range support to the `move` command, but applied the wrong offset to the `to` variable. When the source range is before the current song, and the song thus gets decremented by the range size, then the final destination offset must also be decremented by the range size. Closes https://github.com/MusicPlayerDaemon/MPD/issues/663

queue/PlaylistEdit: fix relative destination offset when moving a range
12a86c49 · Max Kellermann · 0b943585 · 12a86c49 · 12a86c49
Commit 12a86c49 authored Oct 15, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

NEWS NEWS +2 -0

PlaylistEdit.cxx src/queue/PlaylistEdit.cxx +1 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.16 (not yet released)
+* queue
+  - fix relative destination offset when moving a range
 * storage
  - curl: request the "resourcetype" property to fix database update
  - curl: URL-encode more paths

--- a/src/queue/PlaylistEdit.cxx
+++ b/src/queue/PlaylistEdit.cxx
@@ -353,7 +353,7 @@ playlist::MoveRange(PlayerControl &pc, unsigned start, unsigned end, int to)
 			return;
 		to = (currentSong + abs(to)) % GetLength();
 		if (start < (unsigned)to)
-			to--;
+			to -= end - start;
 	}

 	queue.MoveRange(start, end, to);