From 2b471783c084800acd67c37e8a74439c1db864a1 Mon Sep 17 00:00:00 2001
From: Adam <69064669+abres33@users.noreply.github.com>
Date: Fri, 3 Apr 2026 02:00:36 -0500
Subject: [PATCH 1/3] feat: add Cancel Recording button to HUD

---
 src/components/launch/LaunchWindow.tsx | 15 +++++++++++++++
 src/hooks/useScreenRecorder.ts         | 13 +++++++++++++
 src/i18n/locales/en/launch.json        |  1 +
 src/i18n/locales/es/launch.json        |  1 +
 src/i18n/locales/zh-CN/launch.json     |  1 +
 5 files changed, 31 insertions(+)

diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index f1b66b8..d1185e8 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -5,6 +5,7 @@ import { FaRegStopCircle } from "react-icons/fa";
 import { FaFolderOpen } from "react-icons/fa6";
 import { FiMinus, FiX } from "react-icons/fi";
 import {
+	MdCancel,
 	MdMic,
 	MdMicOff,
 	MdMonitor,
@@ -43,6 +44,7 @@ const ICON_CONFIG = {
 	webcamOff: { icon: MdVideocamOff, size: ICON_SIZE },
 	stop: { icon: FaRegStopCircle, size: ICON_SIZE },
 	restart: { icon: MdRestartAlt, size: ICON_SIZE },
+	cancel: { icon: MdCancel, size: ICON_SIZE },
 	record: { icon: BsRecordCircle, size: ICON_SIZE },
 	videoFile: { icon: MdVideoFile, size: ICON_SIZE },
 	folder: { icon: FaFolderOpen, size: ICON_SIZE },
@@ -79,6 +81,7 @@ export function LaunchWindow() {
 		recording,
 		toggleRecording,
 		restartRecording,
+		cancelRecording,
 		microphoneEnabled,
 		setMicrophoneEnabled,
 		microphoneDeviceId,
@@ -477,6 +480,18 @@ export function LaunchWindow() {
 					</Tooltip>
 				)}
 
+				{/* Cancel recording */}
+				{recording && (
+					<Tooltip content={t("tooltips.cancelRecording")}>
+						<button
+							className={`${hudIconBtnClasses} ${styles.electronNoDrag}`}
+							onClick={cancelRecording}
+						>
+							{getIcon("cancel", "text-white/60")}
+						</button>
+					</Tooltip>
+				)}
+
 				{/* Open video file */}
 				<Tooltip content={t("tooltips.openVideoFile")}>
 					<button
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 0c418c1..25adf6d 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -43,6 +43,7 @@ type UseScreenRecorderReturn = {
 	recording: boolean;
 	toggleRecording: () => void;
 	restartRecording: () => void;
+	cancelRecording: () => void;
 	microphoneEnabled: boolean;
 	setMicrophoneEnabled: (enabled: boolean) => void;
 	microphoneDeviceId: string | undefined;
@@ -601,10 +602,22 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		}
 	};
 
+	const cancelRecording = () => {
+		const activeScreenRecorder = screenRecorder.current;
+		if (!activeScreenRecorder || activeScreenRecorder.recorder.state !== "recording") return;
+
+		const activeRecordingId = recordingId.current;
+		discardRecordingId.current = activeRecordingId;
+		allowAutoFinalize.current = false;
+
+		stopRecording.current();
+	};
+
 	return {
 		recording,
 		toggleRecording,
 		restartRecording,
+		cancelRecording,
 		microphoneEnabled,
 		setMicrophoneEnabled,
 		microphoneDeviceId,
diff --git a/src/i18n/locales/en/launch.json b/src/i18n/locales/en/launch.json
index 6e4a4ed..c1229cc 100644
--- a/src/i18n/locales/en/launch.json
+++ b/src/i18n/locales/en/launch.json
@@ -3,6 +3,7 @@
 		"hideHUD": "Hide HUD",
 		"closeApp": "Close App",
 		"restartRecording": "Restart recording",
+		"cancelRecording": "Cancel recording",
 		"openVideoFile": "Open video file",
 		"openProject": "Open project"
 	},
diff --git a/src/i18n/locales/es/launch.json b/src/i18n/locales/es/launch.json
index b25ec3d..f5be07c 100644
--- a/src/i18n/locales/es/launch.json
+++ b/src/i18n/locales/es/launch.json
@@ -3,6 +3,7 @@
 		"hideHUD": "Ocultar HUD",
 		"closeApp": "Cerrar aplicación",
 		"restartRecording": "Reiniciar grabación",
+		"cancelRecording": "Cancelar grabación",
 		"openVideoFile": "Abrir archivo de video",
 		"openProject": "Abrir proyecto"
 	},
diff --git a/src/i18n/locales/zh-CN/launch.json b/src/i18n/locales/zh-CN/launch.json
index 84fdcef..0c2b319 100644
--- a/src/i18n/locales/zh-CN/launch.json
+++ b/src/i18n/locales/zh-CN/launch.json
@@ -3,6 +3,7 @@
 		"hideHUD": "隐藏控制面板",
 		"closeApp": "关闭应用",
 		"restartRecording": "重新开始录制",
+		"cancelRecording": "取消录制",
 		"openVideoFile": "打开视频文件",
 		"openProject": "打开项目"
 	},

From d6933813bdcdd841fdbe038703fb9ef7e110134e Mon Sep 17 00:00:00 2001
From: Adam <69064669+abres33@users.noreply.github.com>
Date: Fri, 3 Apr 2026 02:25:29 -0500
Subject: [PATCH 2/3] fix: move try/catch outside evaluate() in gif-export E2E
 test

---
 tests/e2e/gif-export.spec.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/gif-export.spec.ts b/tests/e2e/gif-export.spec.ts
index a851546..c32d604 100644
--- a/tests/e2e/gif-export.spec.ts
+++ b/tests/e2e/gif-export.spec.ts
@@ -58,14 +58,15 @@ test("exports a GIF from a loaded video", async () => {
 			);
 		});
 
-		await hudWindow.evaluate((videoPath: string) => {
-			window.electronAPI.setCurrentVideoPath(videoPath);
-			try {
+		try {
+			await hudWindow.evaluate((videoPath: string) => {
+				window.electronAPI.setCurrentVideoPath(videoPath);
 				window.electronAPI.switchToEditor();
-			} catch {
-				// Expected: HUD window closes during this call, killing the context.
-			}
-		}, TEST_VIDEO);
+			}, TEST_VIDEO);
+		} catch {
+			// Expected: switchToEditor() closes the HUD window, which terminates
+			// the Playwright page context before evaluate() can resolve.
+		}
 
 		// ── 3. Switch to the editor window. This closes the HUD and opens
 		//       a new BrowserWindow with ?windowType=editor.

From 27853cc2c3069bad6d07ed60299e6d3cfd9a149a Mon Sep 17 00:00:00 2001
From: Adam <69064669+abres33@users.noreply.github.com>
Date: Fri, 3 Apr 2026 02:32:47 -0500
Subject: [PATCH 3/3] fix: await setCurrentVideoPath and narrow catch in
 gif-export E2E test

---
 tests/e2e/gif-export.spec.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/gif-export.spec.ts b/tests/e2e/gif-export.spec.ts
index c32d604..c3a0afb 100644
--- a/tests/e2e/gif-export.spec.ts
+++ b/tests/e2e/gif-export.spec.ts
@@ -59,13 +59,21 @@ test("exports a GIF from a loaded video", async () => {
 		});
 
 		try {
-			await hudWindow.evaluate((videoPath: string) => {
-				window.electronAPI.setCurrentVideoPath(videoPath);
+			await hudWindow.evaluate(async (videoPath: string) => {
+				await window.electronAPI.setCurrentVideoPath(videoPath);
 				window.electronAPI.switchToEditor();
 			}, TEST_VIDEO);
-		} catch {
+		} catch (error) {
 			// Expected: switchToEditor() closes the HUD window, which terminates
 			// the Playwright page context before evaluate() can resolve.
+			if (
+				!(
+					error instanceof Error &&
+					error.message.includes("Target page, context or browser has been closed")
+				)
+			) {
+				throw error;
+			}
 		}
 
 		// ── 3. Switch to the editor window. This closes the HUD and opens