Merge pull request #42 from Mavulp/fix-state

Fix state reverting to stopped on empty playlist

1 files changed, 8 insertions, 4 deletions

diff --git a/src/bot/music.rs b/src/bot/music.rs
index 06af743..5f7928e 100644
--- a/src/bot/music.rs
+++ b/src/bot/music.rs
@@ -399,19 +399,23 @@ impl MusicBot {
 
                         self.start_playing_audio(request);
                     } else {
-                        self.set_nickname(&format!("🎵 {} ({}%)", self.name, self.volume().round()));
+                        self.update_name(state);
                         self.set_description("");
                     }
                 }
                 State::Stopped => {
-                    self.update_name(state);
-                    self.set_description("");
+                    if *current_state != State::EndOfStream {
+                        self.update_name(state);
+                        self.set_description("");
+                    }
                 }
                 _ => self.update_name(state),
             }
         }
 
-        *current_state = state;
+        if !(*current_state == State::EndOfStream && state == State::Stopped) {
+            *current_state = state;
+        }
 
         Ok(())
     }