Merge pull request #346 from cainiaokan/master

fix ffmpeg.exit()
This commit is contained in:
jeromewu 2022-08-14 18:36:40 +08:00 committed by GitHub
commit 251514c369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -163,7 +163,7 @@ module.exports = (_options = {}) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const args = [...defaultArgs, ..._args].filter((s) => s.length !== 0); const args = [...defaultArgs, ..._args].filter((s) => s.length !== 0);
runResolve = resolve; runResolve = resolve;
runReject = reject runReject = reject;
ffmpeg(...parseArgs(Core, args)); ffmpeg(...parseArgs(Core, args));
}); });
} }
@ -219,14 +219,17 @@ module.exports = (_options = {}) => {
running = false; running = false;
try { try {
Core.exit(1); Core.exit(1);
} catch (e) { } catch (err) {
log(e.message); log(err.message);
if (runReject) {
runReject(err);
}
} finally { } finally {
Core = null; Core = null;
ffmpeg = null; ffmpeg = null;
runResolve = null; runResolve = null;
runReject = null;
} }
} }
}; };