Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 03:53:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

voice: cleanup internals whether end() or destroy() is called

Browse Source
This commit is contained in:
Amish Shah
2019-02-19 13:16:48 +00:00
parent 4009986bc8
commit 6aa792f9ab
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/voice/dispatcher/StreamDispatcher.js
View File

@@ -67,6 +67,7 @@ class StreamDispatcher extends Writable {
this.count = 0; this.count = 0;
this.on('finish', () => { this.on('finish', () => {
this._cleanup();
// Still emitting end for backwards compatibility, probably remove it in the future! // Still emitting end for backwards compatibility, probably remove it in the future!
this.emit('end'); this.emit('end');
this._setSpeaking(0); this._setSpeaking(0);
@@ -114,12 +115,16 @@ class StreamDispatcher extends Writable {
} }
_destroy(err, cb) { _destroy(err, cb) {
this._cleanup();
super._destroy(err, cb);
}
_cleanup() {
if (this.player.dispatcher === this) this.player.dispatcher = null; if (this.player.dispatcher === this) this.player.dispatcher = null;
const { streams } = this; const { streams } = this;
if (streams.broadcast) streams.broadcast.dispatchers.delete(this); if (streams.broadcast) streams.broadcast.dispatchers.delete(this);
if (streams.opus) streams.opus.destroy(); if (streams.opus) streams.opus.destroy();
if (streams.ffmpeg) streams.ffmpeg.destroy(); if (streams.ffmpeg) streams.ffmpeg.destroy();
super._destroy(err, cb);
} }
/** /**