From d7806c61e528d5752fa335ea2bc8c818c586f3b9 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 14 Mar 2016 17:54:48 -0700
Subject: Fix clearing queue during radio not cancelling it

---
 .../java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 1 +
 app/src/main/java/github/daneren2005/dsub/service/DownloadService.java  | 2 ++
 app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java   | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/github')

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index ba2807ec..67dcc6a2 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -1082,6 +1082,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
 			@Override
 			protected Void doInBackground() throws Throwable {
 				DownloadService downloadService = getDownloadService();
+				downloadService.clear();
 				downloadService.setArtistRadio(artistId);
 				return null;
 			}
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 8ea7538b..47ffa8d9 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -786,6 +786,8 @@ public class DownloadService extends Service {
 		suggestedPlaylistName = null;
 		suggestedPlaylistId = null;
 
+		setShufflePlayEnabled(false);
+		setArtistRadio(null);
 		checkDownloads();
 	}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java b/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
index 2af468f6..b42fa066 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
@@ -66,7 +66,6 @@ public class ArtistRadioBuffer {
 			buffer.clear();
 		}
 
-		context.clear();
 		this.artistId = artistId;
 		awaitingResults = true;
 		refill();
-- 
cgit v1.2.3