1 files changed, 2 insertions, 0 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index e417ce88..cce2796f 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -854,6 +854,8 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 		}
         if (index != -1 && nextPlayingIndex < size()) {
 			if(nextPlaying != null && downloadList.get(nextPlayingIndex) == nextPlaying && nextPlayerState == PlayerState.PREPARED && remoteState == RemoteControlState.LOCAL) {
+				mediaPlayer.setOnCompletionListener(null);
+				mediaPlayer.reset();
 				playNext(true);
 			} else {
 	            play(nextPlayingIndex);