Skip to content

Commit c0a95d5

Browse files
authored
Merge pull request #346 from cainiaokan/master
fix ffmpeg.exit()
2 parents 3b701de + de35078 commit c0a95d5

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/createFFmpeg.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ module.exports = (_options = {}) => {
163163
return new Promise((resolve, reject) => {
164164
const args = [...defaultArgs, ..._args].filter((s) => s.length !== 0);
165165
runResolve = resolve;
166-
runReject = reject
166+
runReject = reject;
167167
ffmpeg(...parseArgs(Core, args));
168168
});
169169
}
@@ -219,14 +219,17 @@ module.exports = (_options = {}) => {
219219
running = false;
220220
try {
221221
Core.exit(1);
222-
} catch (e) {
223-
log(e.message);
222+
} catch (err) {
223+
log(err.message);
224+
if (runReject) {
225+
runReject(err);
226+
}
224227
} finally {
225228
Core = null;
226229
ffmpeg = null;
227230
runResolve = null;
231+
runReject = null;
228232
}
229-
230233
}
231234
};
232235

0 commit comments

Comments
 (0)