1 files changed, 7 insertions, 2 deletions
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);
         }
     }