dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-08 09:13:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Maybe fix #694?

Browse source
This commit is contained in:
Amish Shah 2016-09-13 20:30:39 +01:00
parent fbcea236c5
commit b0adc881f3
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docs.json
View file

File diff suppressed because one or more lines are too long

16
src/client/voice/player/BasePlayer.js
View file

@ -49,10 +49,17 @@ class VoiceConnectionPlayer extends EventEmitter {
const streams = this.processMap.get(stream); const streams = this.processMap.get(stream);
this._streamingData = this.dispatcher.streamingData; this._streamingData = this.dispatcher.streamingData;
this.emit('debug', 'Cleaning up player after audio stream ended or encountered an error'); this.emit('debug', 'Cleaning up player after audio stream ended or encountered an error');
const dummyHandler = () => null;
if (streams) { if (streams) {
this.processMap.delete(stream); this.processMap.delete(stream);
if (streams.inputStream && streams.pcmConverter) { if (streams.inputStream && streams.pcmConverter) {
try { try {
streams.inputStream.once('error', dummyHandler);
streams.pcmConverter.once('error', dummyHandler);
streams.pcmConverter.stdin.once('error', dummyHandler);
streams.pcmConverter.stdout.once('error', dummyHandler);
if (streams.inputStream.unpipe) { if (streams.inputStream.unpipe) {
streams.inputStream.unpipe(streams.pcmConverter.stdin); streams.inputStream.unpipe(streams.pcmConverter.stdin);
this.emit('debug', '- Unpiped input stream'); this.emit('debug', '- Unpiped input stream');
@ -69,6 +76,15 @@ class VoiceConnectionPlayer extends EventEmitter {
this.emit('debug', '- Killed the pcm converter'); this.emit('debug', '- Killed the pcm converter');
} }
} catch (err) { } catch (err) {
// if an error happened make sure the pcm converter is killed anyway
try {
if (streams.pcmConverter && streams.pcmConverter.kill) {
streams.pcmConverter.kill('SIGINT');
this.emit('debug', '- Killed the pcm converter after previous error (abnormal)');
}
} catch (e) {
return e;
}
return err; return err;
} }
} }