From 008f611bca3173e21027a568540281c0d7d03ef2 Mon Sep 17 00:00:00 2001 From: Dave Hooper Date: Wed, 8 Jul 2009 00:30:23 +0000 Subject: Fix bug in playlist_move where the track would end up one place too early / too late if the move wrapped from one end of the playlist indices to the other end git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21708 a1c6a512-1295-4272-9138-f99709370657 --- apps/playlist.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'apps/playlist.c') diff --git a/apps/playlist.c b/apps/playlist.c index 58e0042646..1d291cf6d0 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -3093,16 +3093,18 @@ int playlist_move(struct playlist_info* playlist, int index, int new_index) sizeof(filename)) < 0) return -1; + /* We want to insert the track at the position that was specified by + new_index. This may be different then new_index because of the + shifting that will occur after the delete. + We calculate this before we do the remove as it depends on the + size of the playlist before the track removal */ + r = rotate_index(playlist, new_index); + /* Delete track from original position */ result = remove_track_from_playlist(playlist, index, true); if (result != -1) { - /* We want to insert the track at the position that was specified by - new_index. This may be different then new_index because of the - shifting that occurred after the delete */ - r = rotate_index(playlist, new_index); - if (r == 0) /* First index */ new_index = PLAYLIST_PREPEND; -- cgit v1.2.3