From 210baee0dac278a6f9e824dc5aeefacfa2e86494 Mon Sep 17 00:00:00 2001
From: dheerajmr01 <dheerajmr01@gmail.com>
Date: Sat, 4 Apr 2026 14:25:48 -0500
Subject: [PATCH] added  acquireId guard to prevent stale getUserMedia from
 repopulating webcamStream

---
 src/hooks/useScreenRecorder.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 5564716..f4a624c 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -104,6 +104,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const discardRecordingId = useRef<number | null>(null);
 	const restarting = useRef(false);
 	const webcamReady = useRef(false);
+	const webcamAcquireId = useRef(0);
 
 	const selectMimeType = () => {
 		const preferred = [
@@ -183,6 +184,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 
 		let cancelled = false;
 		let acquiredStream: MediaStream | null = null;
+		const thisAcquireId = ++webcamAcquireId.current;
 		webcamReady.current = false;
 
 		const acquire = async () => {
@@ -203,7 +205,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 							},
 				});
 
-				if (cancelled) {
+				if (cancelled || thisAcquireId !== webcamAcquireId.current) {
 					stream.getTracks().forEach((track) => {
 						track.onended = null;
 						track.stop();
@@ -499,6 +501,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 					});
 				}
 				if (!webcamStream.current) {
+					webcamAcquireId.current++;
 					setWebcamEnabledState(false);
 				}
 			}