From 86510a4d42081ae6143a79db9a942872033eedb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= <fx.thomas@gmail.com>
Date: Wed, 1 May 2019 01:48:09 +0200
Subject: [PATCH] Use the clear action to stop the internet radio

---
 .../src/main/java/org/airsonic/player/domain/PlayQueue.java     | 2 ++
 airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
index 14d18a5d..15d57515 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
@@ -226,6 +226,8 @@ public class PlayQueue {
     public synchronized void clear() {
         makeBackup();
         files.clear();
+        setRandomSearchCriteria(null);
+        setInternetRadio(null);
         index = 0;
     }
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
index ec35fefc..9aec6388 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -504,7 +504,6 @@
         $("select#moreActions #removeSelected").prop("disabled", internetRadioEnabled);
         $("select#moreActions #download").prop("disabled", internetRadioEnabled);
         $("select#moreActions #appendPlaylist").prop("disabled", internetRadioEnabled);
-        $("#clearQueue").toggleLink(!internetRadioEnabled);
         $("#shuffleQueue").toggleLink(!internetRadioEnabled);
         $("#repeatQueue").toggleLink(!internetRadioEnabled);
         $("#undoQueue").toggleLink(!internetRadioEnabled);