From f704468aaddadaeafa8a650604254b74905619d8 Mon Sep 17 00:00:00 2001 From: Anthony Date: Wed, 30 May 2018 20:23:05 -0400 Subject: [PATCH] Added topic restoration after music player is shutdown --- src/main/java/netneutrality/music/MusicManager.java | 3 ++- src/main/java/netneutrality/music/TrackScheduler.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/netneutrality/music/MusicManager.java b/src/main/java/netneutrality/music/MusicManager.java index c81ff7f..c87b528 100644 --- a/src/main/java/netneutrality/music/MusicManager.java +++ b/src/main/java/netneutrality/music/MusicManager.java @@ -34,6 +34,7 @@ public class MusicManager { private final static Map managers = new ConcurrentHashMap<>(); private long guildId; private boolean isPlaying = false; + private String topic; private MusicManager(Guild guild) { @@ -93,7 +94,7 @@ public class MusicManager { public synchronized void stopMusic() { if (scheduler.getTextChannel() != null) - scheduler.getTextChannel().getManager().setTopic("").queue(); + scheduler.getTextChannel().getManager().setTopic(scheduler.topic).queue(); player.destroy(); } diff --git a/src/main/java/netneutrality/music/TrackScheduler.java b/src/main/java/netneutrality/music/TrackScheduler.java index f2b3d50..2c0221a 100644 --- a/src/main/java/netneutrality/music/TrackScheduler.java +++ b/src/main/java/netneutrality/music/TrackScheduler.java @@ -21,6 +21,7 @@ public class TrackScheduler extends AudioEventAdapter { private final AudioPlayer player; private TextChannel channel; public final BlockingQueue queue; + public String topic; public TrackScheduler(AudioPlayer player) { this.player = player; @@ -40,6 +41,7 @@ public class TrackScheduler extends AudioEventAdapter { public void setTextChannel(TextChannel channel) { this.channel = channel; + topic = channel.getTopic(); } public TextChannel getTextChannel() { @@ -56,7 +58,7 @@ public class TrackScheduler extends AudioEventAdapter { if (track != null) channel.getManager().setTopic(":speaker: Now playing : " + track.getInfo().title).queue(); else - channel.getManager().setTopic("").queue(); + channel.getManager().setTopic(topic).queue(); player.startTrack(track, false); }