From a86e22e0fc31264e8e14bfea2390adf1abfeaaff Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Mon, 27 May 2024 09:50:02 -0600
Subject: [PATCH] Fix live view updating when it shouldn't be (#11561)

* Simplify live image update logic

* Fix case where go2rtc is not setup
---
 web/src/components/player/LivePlayer.tsx | 26 ++++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/web/src/components/player/LivePlayer.tsx b/web/src/components/player/LivePlayer.tsx
index a57c697d4..2cbd8921b 100644
--- a/web/src/components/player/LivePlayer.tsx
+++ b/web/src/components/player/LivePlayer.tsx
@@ -80,7 +80,7 @@ export default function LivePlayer({
   // camera still state
 
   const stillReloadInterval = useMemo(() => {
-    if (!windowVisible) {
+    if (!windowVisible || offline) {
       return -1; // no reason to update the image when the window is not visible
     }
 
@@ -88,12 +88,12 @@ export default function LivePlayer({
       return 60000;
     }
 
-    if (cameraActive) {
+    if (activeMotion || activeTracking) {
       return 200;
     }
 
     return 30000;
-  }, [liveReady, cameraActive, windowVisible]);
+  }, [liveReady, activeMotion, activeTracking, offline, windowVisible]);
 
   if (!cameraConfig) {
     return <ActivityIndicator />;
@@ -135,14 +135,18 @@ export default function LivePlayer({
       );
     }
   } else if (liveMode == "jsmpeg") {
-    player = (
-      <JSMpegPlayer
-        className="flex size-full justify-center overflow-hidden rounded-lg md:rounded-2xl"
-        camera={cameraConfig.live.stream_name}
-        width={cameraConfig.detect.width}
-        height={cameraConfig.detect.height}
-      />
-    );
+    if (cameraActive) {
+      player = (
+        <JSMpegPlayer
+          className="flex size-full justify-center overflow-hidden rounded-lg md:rounded-2xl"
+          camera={cameraConfig.live.stream_name}
+          width={cameraConfig.detect.width}
+          height={cameraConfig.detect.height}
+        />
+      );
+    } else {
+      player = null;
+    }
   } else {
     player = <ActivityIndicator />;
   }