#536 Fix infinite looping if playing a album with no songs downloaded

1 files changed, 9 insertions, 0 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
index 5673c427..bac7093a 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -860,6 +860,7 @@ public class DownloadService extends Service {
 		return index;
 	}
 	private int checkNextIndexValid(int index, RepeatMode repeatMode) {
+		int startIndex = index;
 		int size = size();
 		if(index < size && index != -1) {
 			if(!Util.isAllowedToDownload(this)){
@@ -873,6 +874,14 @@ public class DownloadService extends Service {
 						} else {
 							return -1;
 						}
+					} else if(index == startIndex) {
+						handler.post(new Runnable() {
+							@Override
+							public void run() {
+								Util.toast(DownloadService.this, R.string.download_playerstate_mobile_disabled);
+							}
+						});
+						return -1;
 					}
 
 					next = downloadList.get(index);