huanld/openscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix:prevent stale countdown IPC updates from repainting overlay

Browse Source
This commit is contained in:
Galactic99
2026-04-16 19:22:57 +05:30
parent 6b08a0a72a
commit ea68e4cfc3
5 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/launch/CountdownOverlay.tsx
+4 -1
View File
@@ -14,7 +14,10 @@ export function CountdownOverlay() {
return (
<div className="w-screen h-screen bg-transparent flex items-center justify-center pointer-events-none select-none">
{value === null ? null : (
<div className="text-white/90 text-[120px] font-bold leading-none tabular-nums">
<div
className="text-white/90 text-[120px] font-bold leading-none tabular-nums"
style={{ textShadow: "0 4px 24px rgba(0, 0, 0, 0.65)" }}
>
{value}
</div>
)}
src/hooks/useScreenRecorder.ts
+21 -11
View File
@@ -336,9 +336,10 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
}
return () => {
const activeRunId = countdownRunId.current;
if (cleanup) cleanup();
countdownRunId.current += 1;
void window.electronAPI.hideCountdownOverlay();
void window.electronAPI.hideCountdownOverlay(activeRunId);
allowAutoFinalize.current = false;
restarting.current = false;
discardRecordingId.current = null;
@@ -370,14 +371,15 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
}, [teardownMedia]);
const cancelCountdown = () => {
const activeRunId = countdownRunId.current;
countdownRunId.current += 1;
setCountdownActive(false);
void window.electronAPI.hideCountdownOverlay();
void window.electronAPI.hideCountdownOverlay(activeRunId);
};
const safeShowCountdownOverlay = async (value: number) => {
const safeShowCountdownOverlay = async (value: number, runId: number) => {
try {
await window.electronAPI.showCountdownOverlay(value);
await window.electronAPI.showCountdownOverlay(value, runId);
return true;
} catch (error) {
console.warn("Failed to show countdown overlay:", error);
@@ -385,17 +387,17 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
}
};
const safeSetCountdownOverlayValue = async (value: number) => {
const safeSetCountdownOverlayValue = async (value: number, runId: number) => {
try {
await window.electronAPI.setCountdownOverlayValue(value);
await window.electronAPI.setCountdownOverlayValue(value, runId);
} catch (error) {
console.warn("Failed to update countdown overlay value:", error);
}
};
const safeHideCountdownOverlay = async () => {
const safeHideCountdownOverlay = async (runId: number) => {
try {
await window.electronAPI.hideCountdownOverlay();
await window.electronAPI.hideCountdownOverlay(runId);
} catch (error) {
console.warn("Failed to hide countdown overlay:", error);
}
@@ -427,7 +429,11 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
try {
const values = [3, 2, 1];
const overlayShown = await safeShowCountdownOverlay(values[0]);
const overlayShown = await safeShowCountdownOverlay(values[0], runId);
if (countdownRunId.current !== runId) {
return;
}
for (const value of values) {
if (countdownRunId.current !== runId) {
@@ -435,7 +441,11 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
}
if (overlayShown && value !== values[0]) {
await safeSetCountdownOverlayValue(value);
await safeSetCountdownOverlayValue(value, runId);
if (countdownRunId.current !== runId) {
return;
}
}
await new Promise((resolve) => window.setTimeout(resolve, 1000));
@@ -449,7 +459,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
} finally {
if (countdownRunId.current === runId) {
setCountdownActive(false);
await safeHideCountdownOverlay();
await safeHideCountdownOverlay(runId);
}
}
};