Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-08-04 13:47:37 +02:00
Code Issues Projects Releases Wiki Activity

Quick fix (#16926)

Browse Source 
* fix

* Fix

* Fix incorrect default websocket value

* Cleanup value setting
This commit is contained in:
Nicolas Mowen 2025-03-03 16:28:34 -07:00 committed by GitHub
parent 2946c935ee
commit 56079d080d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/object_processing.py
View File

@ -707,16 +707,14 @@ class TrackedObjectProcessor(threading.Thread):
def _get_enabled_state(self, camera: str) -> bool: def _get_enabled_state(self, camera: str) -> bool:
_, config_data = self.enabled_subscribers[camera].check_for_update() _, config_data = self.enabled_subscribers[camera].check_for_update()
if config_data: if config_data:
enabled = config_data.enabled self.config.cameras[camera].enabled = config_data.enabled
if self.camera_states[camera].prev_enabled is None: if self.camera_states[camera].prev_enabled is None:
self.camera_states[camera].prev_enabled = enabled self.camera_states[camera].prev_enabled = config_data.enabled
return enabled
return ( return self.config.cameras[camera].enabled
self.camera_states[camera].prev_enabled
if self.camera_states[camera].prev_enabled is not None
else self.config.cameras[camera].enabled
)
def run(self): def run(self):
while not self.stop_event.is_set(): while not self.stop_event.is_set():

2
web/src/api/ws.tsx
View File

@ -174,7 +174,7 @@ export function useEnabledState(camera: string): {
value: { payload }, value: { payload },
send, send,
} = useWs(`${camera}/enabled/state`, `${camera}/enabled/set`); } = useWs(`${camera}/enabled/state`, `${camera}/enabled/set`);
return { payload: payload as ToggleableSetting, send }; return { payload: (payload ?? "ON") as ToggleableSetting, send };
} }
export function useDetectState(camera: string): { export function useDetectState(camera: string): {

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

@ -203,6 +203,9 @@ export default function LivePlayer({
const prevCameraEnabledRef = useRef(cameraEnabled ?? true); const prevCameraEnabledRef = useRef(cameraEnabled ?? true);
useEffect(() => { useEffect(() => {
if (cameraEnabled == undefined) {
return;
}
if (!prevCameraEnabledRef.current && cameraEnabled) { if (!prevCameraEnabledRef.current && cameraEnabled) {
// Camera enabled // Camera enabled
setLiveReady(false); setLiveReady(false);

4
web/src/hooks/use-camera-activity.ts
View File

@ -16,7 +16,7 @@ import useSWR from "swr";
import { getAttributeLabels } from "@/utils/iconUtil"; import { getAttributeLabels } from "@/utils/iconUtil";
type useCameraActivityReturn = { type useCameraActivityReturn = {
enabled: boolean; enabled?: boolean;
activeTracking: boolean; activeTracking: boolean;
activeMotion: boolean; activeMotion: boolean;
objects: ObjectType[]; objects: ObjectType[];
@ -148,7 +148,7 @@ export function useCameraActivity(
return cameras[camera.name].camera_fps == 0 && stats["service"].uptime > 60; return cameras[camera.name].camera_fps == 0 && stats["service"].uptime > 60;
}, [camera, stats]); }, [camera, stats]);
const isCameraEnabled = cameraEnabled === "ON"; const isCameraEnabled = cameraEnabled ? cameraEnabled === "ON" : undefined;
return { return {
enabled: isCameraEnabled, enabled: isCameraEnabled,