Fix forSong returning a dummy DownloadFile when not actively downloading

1 files changed, 13 insertions, 4 deletions

diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index b555da99..85991abb 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -423,11 +423,16 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 
     @Override
     public synchronized DownloadFile forSong(MusicDirectory.Entry song) {
+    	DownloadFile returnFile = null;
         for (DownloadFile downloadFile : downloadList) {
-            if (downloadFile.getSong().equals(song) &&
-					((downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && downloadFile.getPartialFile().exists())
-					|| downloadFile.isWorkDone())) {
-                return downloadFile;
+            if (downloadFile.getSong().equals(song)) {
+            	if(((downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && downloadFile.getPartialFile().exists()) || downloadFile.isWorkDone())) {
+            		// If downloading, return immediately
+                	return downloadFile;
+				} else {
+					// Otherwise, check to make sure there isn't a background download going on first
+					returnFile = downloadFile;
+				}
             }
         }
 		for (DownloadFile downloadFile : backgroundDownloadList) {
@@ -435,6 +440,10 @@ public class DownloadServiceImpl extends Service implements DownloadService {
                 return downloadFile;
             }
         }
+        
+        if(returnFile != null) {
+        	return returnFile;
+        }
 
         DownloadFile downloadFile = downloadFileCache.get(song);
         if (downloadFile == null) {