From 0ef935c758c640e132a36c08d4404516b3be4b00 Mon Sep 17 00:00:00 2001
From: ILW8 <daohengliu@gmail.com>
Date: Sun, 26 Dec 2021 16:46:12 +0000
Subject: [PATCH] fix crash when ffmpeg fails during hitsound rendering

---
 renderer/render_frame.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/renderer/render_frame.js b/renderer/render_frame.js
index f0476a2..514842a 100644
--- a/renderer/render_frame.js
+++ b/renderer/render_frame.js
@@ -137,7 +137,7 @@ async function renderHitsounds(mediaPromise, beatmap, start_time, actual_length,
 		for(const scoringFrame of scoringFrames){
 			if(scoringFrame.combo >= scoringFrame.previousCombo || scoringFrame.previousCombo < 30)
 				continue;
-	
+
 			hitSounds.push({
 				offset: (scoringFrame.offset - start_time) / time_scale,
 				sound: 'combobreak',
@@ -156,7 +156,7 @@ async function renderHitsounds(mediaPromise, beatmap, start_time, actual_length,
 			if(beatmap.Replay.auto !== true){
 				if(hitObject.hitOffset == null)
 					continue;
-	
+
 				offset += hitObject.hitOffset;
 			}
 
@@ -175,7 +175,7 @@ async function renderHitsounds(mediaPromise, beatmap, start_time, actual_length,
 				}
 			}
 		}
-		
+
 		if(hitObject.objectName == 'slider'){
 			hitObject.EdgeHitSounds.forEach((edgeHitSounds, index) => {
 				edgeHitSounds.forEach(hitSound => {
@@ -184,7 +184,7 @@ async function renderHitsounds(mediaPromise, beatmap, start_time, actual_length,
 					if(index == 0 && beatmap.Replay.auto !== true){
 						if(hitObject.hitOffset == null)
 							return;
-						
+
 						offset += hitObject.hitOffset;
 					}
 
@@ -306,7 +306,7 @@ async function renderHitsounds(mediaPromise, beatmap, start_time, actual_length,
 			await execFilePromise(ffmpeg, mergeArgs, { shell: true });
 
 			resolve(path.resolve(file_path, 'merged.wav'));
-		});
+		}).catch(reject);
 	});
 }
 
@@ -377,7 +377,7 @@ async function downloadMedia(options, beatmap, beatmap_path, size, download_path
 				{ apply: 'shade', params: [80] }
 			])
 			.writeAsync(path.resolve(extraction_path, 'bg.png'));
-	
+
 			output.background_path = path.resolve(extraction_path, 'bg.png');
 		}catch(e){
 			output.background_path = null;
@@ -787,7 +787,7 @@ module.exports = {
 								name: `video.${options.type}`
 							}]}).then(() => {
 								fs.promises.rm(file_path, { recursive: true }).catch(helper.error);
-							}).catch(console.error);					 
+							}).catch(console.error);
 						});
 
 						ffmpegProcess.stderr.on('data', data => {