From 060659044ee6fb91ddd5c314170e33170d187a39 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Thu, 20 Mar 2025 14:09:57 -0600 Subject: [PATCH] Quick fixes (#17278) * Fix check * Fix default loading state --- frigate/api/app.py | 4 +++- web/src/hooks/use-camera-activity.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frigate/api/app.py b/frigate/api/app.py index 4f45678d0..0d391035e 100644 --- a/frigate/api/app.py +++ b/frigate/api/app.py @@ -85,7 +85,9 @@ def go2rtc_camera_stream(request: Request, camera_name: str): f"http://127.0.0.1:1984/api/streams?src={camera_name}&video=all&audio=allµphone" ) if not r.ok: - if request.app.frigate_config.cameras.get(camera_name, {}).get("enabled", True): + camera_config = request.app.frigate_config.cameras.get(camera_name) + + if camera_config and camera_config.enabled: logger.error("Failed to fetch streams from go2rtc") return JSONResponse( diff --git a/web/src/hooks/use-camera-activity.ts b/web/src/hooks/use-camera-activity.ts index 96b5f6ea5..b81ad54b0 100644 --- a/web/src/hooks/use-camera-activity.ts +++ b/web/src/hooks/use-camera-activity.ts @@ -147,7 +147,7 @@ export function useCameraActivity( return cameras[camera.name].camera_fps == 0 && stats["service"].uptime > 60; }, [camera, stats]); - const isCameraEnabled = cameraEnabled ? cameraEnabled === "ON" : undefined; + const isCameraEnabled = cameraEnabled ? cameraEnabled === "ON" : true; return { enabled: isCameraEnabled,