From b7ab1202b8d4f65e2a4ef26abb74cb15f5ffdf37 Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Mon, 24 May 2021 19:57:46 +0200
Subject: [PATCH] Clear worker channel when worker has died

Should prevent panic in `Spotify::send_worker()`
---
 src/spotify.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/spotify.rs b/src/spotify.rs
index b545dbf..67f2613 100644
--- a/src/spotify.rs
+++ b/src/spotify.rs
@@ -117,13 +117,23 @@ impl Spotify {
             .write()
             .expect("can't writelock worker channel") = Some(tx);
         {
+            let worker_channel = self.channel.clone();
             let cfg = self.cfg.clone();
             let events = self.events.clone();
             let volume = self.volume();
             let credentials = self.credentials.clone();
             let handle = tokio::runtime::Handle::current();
             handle.spawn(async move {
-                Self::worker(events, rx, cfg.clone(), credentials, user_tx, volume).await
+                Self::worker(
+                    worker_channel,
+                    events,
+                    rx,
+                    cfg.clone(),
+                    credentials,
+                    user_tx,
+                    volume,
+                )
+                .await
             });
         }
 
@@ -173,6 +183,7 @@ impl Spotify {
     }
 
     async fn worker(
+        worker_channel: Arc<RwLock<Option<mpsc::UnboundedSender<WorkerCommand>>>>,
         events: EventManager,
         commands: mpsc::UnboundedReceiver<WorkerCommand>,
         cfg: Arc<config::Config>,
@@ -228,6 +239,9 @@ impl Spotify {
         worker.run_loop().await;
 
         error!("worker thread died, requesting restart");
+        *worker_channel
+            .write()
+            .expect("can't writelock worker channel") = None;
         events.send(Event::SessionDied)
     }