Merge branch 'master' into james-server-stats

1 files changed, 12 insertions, 2 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index f461cf3fa..070d49ec3 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -70,7 +70,14 @@ export namespace DashUploadUtils {
         // make a list of paths to create the ordered text file for ffmpeg
         const filePathsText = filePaths.map(filePath => `file '${filePath}'`).join('\n');
         // write the text file to the file system
-        writeFile(textFilePath, filePathsText, err => console.log(err));
+        await new Promise<void>((res, reject) =>
+            writeFile(textFilePath, filePathsText, err => {
+                if (err) {
+                    reject();
+                    console.log(err);
+                } else res();
+            })
+        );
 
         // make output file name based on timestamp
         const outputFileName = `output-${Utils.GenerateGuid()}.mp4`;
@@ -86,7 +93,10 @@ export namespace DashUploadUtils {
                 .outputOptions('-c copy')
                 //.videoCodec("copy")
                 .save(outputFilePath)
-                .on('error', reject)
+                .on('error', (err: any) => {
+                    console.log(err);
+                    reject();
+                })
                 .on('end', resolve);
         });