From 17931776ac3a932e90f014c8a80bdaf6cfaa45d1 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 28 Jan 2023 21:06:05 -0800 Subject: [PATCH] apply dieseldude fix for monitor launch --- libs/ffmpeg.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/ffmpeg.js b/libs/ffmpeg.js index 4e379911..1700a137 100644 --- a/libs/ffmpeg.js +++ b/libs/ffmpeg.js @@ -46,9 +46,7 @@ module.exports = async (s,config,lang,onFinish) => { if(allOutputs.filter(output => !!output).length > 0){ return new Promise((resolve) => { var hasResolved = false - var completionTimer = null; function completeResolve(data){ - clearTimeout(completionTimer) if(!hasResolved){ hasResolved = true resolve(data) @@ -112,12 +110,11 @@ module.exports = async (s,config,lang,onFinish) => { console.log(data.toString()) }) } - cameraProcess.stdio[5].once('data',(data) => { - completeResolve(cameraProcess) - }) - completionTimer = setTimeout(() => { - completeResolve(cameraProcess) - },20000) + for (let i = 0; i < stdioPipes.length; i++) { + cameraProcess.stdio[i].once('data',(data) => { + completeResolve(cameraProcess) + }) + } }catch(err){ completeResolve(null) s.systemLog(err)