Merge pull request #313 from meiiie/fix/fullscreen-countdown-recovery

fix(recording): recover from fullscreen countdown failures
This commit is contained in:
webadderall
2026-04-22 17:19:11 +10:00
committed by GitHub
3 changed files with 29 additions and 4 deletions
+15 -1
View File
@@ -154,7 +154,21 @@ function restoreWindowSafely(window: BrowserWindow | null) {
return;
}
window.restore();
if (!isEditorWindow(window) && process.platform === "win32") {
showHudOverlayFromTray();
return;
}
if (window.isMinimized()) {
window.restore();
}
if (!window.isVisible()) {
window.show();
}
window.moveTop();
window.focus();
}
// Tray Icons (lazily created after app is ready to avoid accessing Electron APIs too early)
+6 -1
View File
@@ -904,7 +904,12 @@ export function createCountdownWindow(): BrowserWindow {
win.webContents.on("did-finish-load", () => {
if (!win.isDestroyed()) {
win.show();
if (process.platform === "win32") {
win.showInactive();
win.moveTop();
} else {
win.show();
}
}
});
+8 -2
View File
@@ -1300,8 +1300,14 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
: "Failed to start recording",
);
setRecording(false);
cleanupCapturedMedia();
await stopWebcamRecorder();
try {
await window.electronAPI?.setRecordingState(false);
} catch (stateError) {
console.warn("Failed to reset main-process recording state:", stateError);
} finally {
cleanupCapturedMedia();
await stopWebcamRecorder();
}
} finally {
startInFlight.current = false;
setStarting(false);