Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Use refs for proper js closures in the liveReady timeout (#12464)

Browse Source
This commit is contained in:
Josh Hawkins 2024-07-16 06:50:58 -05:00 committed by GitHub
parent 5c90f7dce7
commit 58dbbd5d29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/src/components/player/LivePlayer.tsx
View File

@ -73,6 +73,15 @@ export default function LivePlayer({
const liveMode = useCameraLiveMode(cameraConfig, preferredLiveMode); const liveMode = useCameraLiveMode(cameraConfig, preferredLiveMode);
const [liveReady, setLiveReady] = useState(false); const [liveReady, setLiveReady] = useState(false);
const liveReadyRef = useRef(liveReady);
const cameraActiveRef = useRef(cameraActive);
useEffect(() => {
liveReadyRef.current = liveReady;
cameraActiveRef.current = cameraActive;
}, [liveReady, cameraActive]);
useEffect(() => { useEffect(() => {
if (!autoLive || !liveReady) { if (!autoLive || !liveReady) {
return; return;
@ -80,7 +89,7 @@ export default function LivePlayer({
if (!cameraActive) { if (!cameraActive) {
const timer = setTimeout(() => { const timer = setTimeout(() => {
if (!cameraActive) { if (liveReadyRef.current && !cameraActiveRef.current) {
setLiveReady(false); setLiveReady(false);
} }
}, 500); }, 500);

2
web/src/views/live/LiveDashboardView.tsx
View File

@ -79,7 +79,7 @@ export default function LiveDashboardView({
return cameras return cameras
.map((cam) => cam.name) .map((cam) => cam.name)
.filter((cam) => config.camera_groups[cameraGroup].cameras.includes(cam)) .filter((cam) => config.camera_groups[cameraGroup]?.cameras.includes(cam))
.join(","); .join(",");
}, [cameras, cameraGroup, config, includeBirdseye]); }, [cameras, cameraGroup, config, includeBirdseye]);