Disconnect old audio session before creating new

fakelag · Mar 23, 2024 · 9ca484e · 9ca484e
1 parent 751879c
commit 9ca484e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/discordplayer/discordplayer_test.go b/discordplayer/discordplayer_test.go
@@ -1008,6 +1008,7 @@ var _ = Describe("Discord Player", func() {
 			gomock.InOrder(
 				playerContext.mockVoiceConnection.EXPECT().Speaking(false),
 				playerContext.mockVoiceConnection.EXPECT().IsReady().Return(false),
+				playerContext.mockVoiceConnection.EXPECT().Disconnect(),
 				playerContext.mockDiscordSession.EXPECT().
 					ChannelVoiceJoin(playerContext.guildID, playerContext.channelID, false, false).
 					Return(playerContext.mockVoiceConnection, nil),
@@ -1066,6 +1067,7 @@ var _ = Describe("Discord Player", func() {
 				playerContext.mockVoiceConnection.EXPECT().Speaking(false),
 				mockDcaStreamingSession.EXPECT().PlaybackPosition().Return(10*time.Second).MinTimes(1),
 				playerContext.mockVoiceConnection.EXPECT().IsReady().Return(false),
+				playerContext.mockVoiceConnection.EXPECT().Disconnect(),
 				playerContext.mockDiscordSession.EXPECT().
 					ChannelVoiceJoin(playerContext.guildID, playerContext.channelID, false, false).
 					Return(playerContext.mockVoiceConnection, nil),

diff --git a/discordplayer/voiceworker.go b/discordplayer/voiceworker.go
@@ -266,6 +266,10 @@ func (dms *DiscordMusicSession) checkDiscordVoiceConnection() error {
 		return nil
 	}
 
+	if dms.voiceConnection != nil {
+		_ = dms.voiceConnection.Disconnect()
+	}
+
 	dms.mutex.RLock()
 	voiceChannelID := dms.voiceChannelID
 	dms.mutex.RUnlock()