diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-04-28 17:38:01 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-04-28 17:38:01 -0700 |
| commit | 7d03be9c2630b97d7ab09de51a430dc39405b81d (patch) | |
| tree | 41d674376d508064fa4b4e30848e6974e3e5bebe /src/github/daneren2005 | |
| parent | 459abcb9dfc85fc0d1413639148e21f8fb773be3 (diff) | |
| parent | 9e5a755dce7de38e5bb930132327177ca62f1eed (diff) | |
| download | dsub-7d03be9c2630b97d7ab09de51a430dc39405b81d.tar.gz dsub-7d03be9c2630b97d7ab09de51a430dc39405b81d.tar.bz2 dsub-7d03be9c2630b97d7ab09de51a430dc39405b81d.zip | |
Merge branch 'master' of https://github.com/daneren2005/Subsonic
Diffstat (limited to 'src/github/daneren2005')
| -rw-r--r-- | src/github/daneren2005/dsub/service/DownloadService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java index 66295d5e..f4edb004 100644 --- a/src/github/daneren2005/dsub/service/DownloadService.java +++ b/src/github/daneren2005/dsub/service/DownloadService.java @@ -1521,10 +1521,11 @@ public class DownloadService extends Service { int currentPlayingIndex = getCurrentPlayingIndex(); DownloadFile movedSong = list.remove(from); list.add(to, movedSong); + currentPlayingIndex = downloadList.indexOf(currentPlaying); if(remoteState != RemoteControlState.LOCAL && mainList) { updateJukeboxPlaylist(); - } else if(mainList && (movedSong == nextPlaying || (currentPlayingIndex + 1) == to)) { - // Moving next playing or moving a song to be next playing + } else if(mainList && (movedSong == nextPlaying || movedSong == currentPlaying || (currentPlayingIndex + 1) == to)) { + // Moving next playing, current playing, or moving a song to be next playing setNextPlaying(); } } |