1 files changed, 5 insertions, 1 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index cba71f8c..a8bb6cd4 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -846,7 +846,11 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 			nextPlayingIndex++;
 		}
         if (index != -1 && nextPlayingIndex < size()) {
-            play(nextPlayingIndex);
+			if(nextPlaying != null && downloadList.get(nextPlayingIndex) == nextPlaying && nextPlayerState == PlayerState.PREPARED && remoteState == RemoteControlState.LOCAL) {
+				playNext(true);
+			} else {
+	            play(nextPlayingIndex);
+			}
         }
     }