From 7be0a2f10f0cfeb89b2f498cfae316b35dcb0814 Mon Sep 17 00:00:00 2001
From: Jokler <jokler@protonmail.com>
Date: Sat, 25 Jan 2020 16:30:37 +0100
Subject: Fix quit method not stopping audio playback

---
 src/bot/music.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/bot/music.rs')

diff --git a/src/bot/music.rs b/src/bot/music.rs
index 3677796..4d67f88 100644
--- a/src/bot/music.rs
+++ b/src/bot/music.rs
@@ -44,7 +44,6 @@ pub struct MusicBot {
     state: Arc<Mutex<State>>,
 }
 
-#[derive(Debug)]
 pub struct MusicBotArgs {
     pub name: String,
     pub owner: Option<ClientId>,
@@ -53,6 +52,7 @@ pub struct MusicBotArgs {
     pub id: Identity,
     pub channel: String,
     pub verbose: u8,
+    pub disconnect_cb: Box<dyn FnMut(String) + Send + Sync>,
 }
 
 impl MusicBot {
@@ -104,7 +104,7 @@ impl MusicBot {
         }
 
         let bot = Arc::new(Self {
-            name: args.name,
+            name: args.name.clone(),
             player,
             teamspeak: connection,
             playlist,
@@ -112,11 +112,14 @@ impl MusicBot {
         });
 
         let cbot = bot.clone();
+        let mut disconnect_cb = args.disconnect_cb;
+        let name = args.name;
         let msg_loop = async move {
             'outer: loop {
                 while let Some(msg) = rx.recv().await {
                     if let MusicBotMessage::Quit(reason) = msg {
                         cbot.with_teamspeak(|ts| ts.disconnect(&reason));
+                        disconnect_cb(name);
                         break 'outer;
                     }
                     cbot.on_message(msg).await.unwrap();
-- 
cgit v1.2.3-70-g09d2