From fef80210f36e14cea4599e0f860f13bc345fa30b Mon Sep 17 00:00:00 2001 From: naextec Date: Wed, 6 Dec 2023 02:13:26 -0500 Subject: [PATCH] Fixes for issue #654 --- src/node/counter-strike/launcher/watch-demo-with-hlae.ts | 2 +- src/node/video/ffmpeg/concatenate-videos-from-sequences.ts | 2 +- src/node/video/ffmpeg/generate-video-with-ffmpeg.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node/counter-strike/launcher/watch-demo-with-hlae.ts b/src/node/counter-strike/launcher/watch-demo-with-hlae.ts index b0ec25eaf..4515f1668 100644 --- a/src/node/counter-strike/launcher/watch-demo-with-hlae.ts +++ b/src/node/counter-strike/launcher/watch-demo-with-hlae.ts @@ -96,7 +96,7 @@ export async function watchDemoWithHlae({ const csExecutablePath = await getCounterStrikeExecutablePath(game); const hlaeParameters: string[] = ['-noGui', '-autoStart']; - const launchOptions = ['-insecure', '-novid', '-sw', '+playdemo', `"${demoPath}"`]; + const launchOptions = ['-insecure', '-novid', '-sw', '+playdemo', `\\"${demoPath}\\"`]; if (width) { launchOptions.push('-width', String(width)); } diff --git a/src/node/video/ffmpeg/concatenate-videos-from-sequences.ts b/src/node/video/ffmpeg/concatenate-videos-from-sequences.ts index 7f8467816..1bfc840b0 100644 --- a/src/node/video/ffmpeg/concatenate-videos-from-sequences.ts +++ b/src/node/video/ffmpeg/concatenate-videos-from-sequences.ts @@ -43,7 +43,7 @@ function getFfmpegArgs(options: ConcatenateVideoOptions) { } for (const sequence of sequences) { const sequenceOutputFilePath = getSequenceOutputFilePath(outputFolderPath, sequence); - args.push(`-i ${sequenceOutputFilePath}`); + args.push(`-i "${sequenceOutputFilePath}"`); } args.push( `-vcodec ${videoCodec} -pix_fmt yuv420p`, diff --git a/src/node/video/ffmpeg/generate-video-with-ffmpeg.ts b/src/node/video/ffmpeg/generate-video-with-ffmpeg.ts index 0d5629116..03b69a612 100644 --- a/src/node/video/ffmpeg/generate-video-with-ffmpeg.ts +++ b/src/node/video/ffmpeg/generate-video-with-ffmpeg.ts @@ -64,7 +64,7 @@ async function getFFmpegArgs(settings: GenerateVideoWithFFmpegSettings) { if (outputParameters !== '') { args.push(outputParameters); } - args.push(getSequenceOutputFilePath(outputFolderPath, sequence)); + args.push('"' + getSequenceOutputFilePath(outputFolderPath, sequence) + '"'); return args; }