diff options
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/DownloadFragment.java | 8 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/service/DownloadServiceImpl.java | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java index 5af030d3..50960834 100644 --- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -231,12 +231,8 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe new SilentBackgroundTask<Boolean>(context) {
@Override
protected Boolean doInBackground() throws Throwable {
- if (getDownloadService().getCurrentPlayingIndex() < getDownloadService().size() - 1) {
- getDownloadService().next();
- return true;
- } else {
- return false;
- }
+ getDownloadService().next();
+ return true;
}
@Override
diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java index 731794de..d88b5262 100644 --- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java +++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java @@ -770,8 +770,13 @@ public class DownloadServiceImpl extends Service implements DownloadService { @Override public synchronized void next() { int index = getCurrentPlayingIndex(); - if (index != -1) { - play(getNextPlayingIndex()); + int nextPlayingIndex = getNextPlayingIndex(); + // Make sure to actually go to next when repeat song is on + if(index == nextPlayingIndex) { + nextPlayingIndex++; + } + if (index != -1 && nextPlayingIndex < size()) { + play(nextPlayingIndex); } } |