Gracefully back off of trying to download songs with server issues

1 files changed, 7 insertions, 5 deletions

diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index 66d31a0f..cae3624b 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -1380,7 +1380,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 				int i = start;
 				do {
 					DownloadFile downloadFile = downloadList.get(i);
-					if (!downloadFile.isWorkDone()) {
+					if (!downloadFile.isWorkDone() && !downloadFile.isFailedMax()) {
 						if (downloadFile.shouldSave() || preloaded < Util.getPreloadCount(this)) {
 							currentDownloading = downloadFile;
 							currentDownloading.download();
@@ -1407,10 +1407,12 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 						revision++;
 						i--;
 					} else {
-						currentDownloading = downloadFile;
-						currentDownloading.download();
-						cleanupCandidates.add(currentDownloading);
-						break;
+						if(!downloadFile.isFailedMax()) {
+							currentDownloading = downloadFile;
+							currentDownloading.download();
+							cleanupCandidates.add(currentDownloading);
+							break;
+						}
 					}
 				}
 			}