Make sure to have only one next playing task going at a time

1 files changed, 4 insertions, 4 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index 17b22e3e..f94d045d 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -537,16 +537,16 @@ public class DownloadServiceImpl extends Service implements DownloadService {
         }
 		
 		nextSetup = false;
+		if(nextPlayingTask != null) {
+			nextPlayingTask.cancel();
+			nextPlayingTask = null;
+		}
 		if(index < size() && index != -1) {
 			nextPlaying = downloadList.get(index);
 			nextPlayingTask = new CheckCompletionTask(nextPlaying);
 			nextPlayingTask.start();
 		} else {
 			nextPlaying = null;
-			if(nextPlayingTask != null) {
-				nextPlayingTask.cancel();
-			}
-			nextPlayingTask = null;
 			setNextPlayerState(IDLE);
 		}
 	}