From d8afdc9fa2e6e358b3beca0175e09d41d0d67ec5 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sun, 1 Jun 2025 07:17:05 -0500
Subject: [PATCH] Fix auto live check for default dashboard and camera groups

Disabling the Automatic Live View switch in Settings should prevent streaming from occurring. Overriding any settings in a camera group will override the global setting. The check here incorrectly always returned false instead of undefined.
---
 docs/docs/configuration/live.md            | 7 ++++++-
 web/src/views/live/DraggableGridLayout.tsx | 7 +++++--
 web/src/views/live/LiveDashboardView.tsx   | 7 +++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/docs/configuration/live.md b/docs/docs/configuration/live.md
index 611922d84..d5f99ae98 100644
--- a/docs/docs/configuration/live.md
+++ b/docs/docs/configuration/live.md
@@ -189,7 +189,12 @@ Frigate provides a dialog in the Camera Group Edit pane with several options for
 
 :::note
 
-The default dashboard ("All Cameras") will always use Smart Streaming and the first entry set in your `streams` configuration, if defined. Use a camera group if you want to change any of these settings from the defaults.
+The default dashboard ("All Cameras") will always use:
+
+- Smart Streaming, unless you've disabled the global Automatic Live View in Settings.
+- The first entry set in your `streams` configuration, if defined.
+
+Use a camera group if you want to change any of these settings from the defaults.
 
 :::
 
diff --git a/web/src/views/live/DraggableGridLayout.tsx b/web/src/views/live/DraggableGridLayout.tsx
index e6977ae39..ccd1b373b 100644
--- a/web/src/views/live/DraggableGridLayout.tsx
+++ b/web/src/views/live/DraggableGridLayout.tsx
@@ -563,9 +563,12 @@ export default function DraggableGridLayout({
               const streamName = streamExists
                 ? streamNameFromSettings
                 : firstStreamEntry;
+              const streamType =
+                currentGroupStreamingSettings?.[camera.name]?.streamType;
               const autoLive =
-                currentGroupStreamingSettings?.[camera.name]?.streamType !==
-                "no-streaming";
+                streamType !== undefined
+                  ? streamType !== "no-streaming"
+                  : undefined;
               const showStillWithoutActivity =
                 currentGroupStreamingSettings?.[camera.name]?.streamType !==
                 "continuous";
diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx
index b00b1a2f5..ddd6ccd51 100644
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@@ -486,9 +486,12 @@ export default function LiveDashboardView({
               const streamName = streamExists
                 ? streamNameFromSettings
                 : firstStreamEntry;
+              const streamType =
+                currentGroupStreamingSettings?.[camera.name]?.streamType;
               const autoLive =
-                currentGroupStreamingSettings?.[camera.name]?.streamType !==
-                "no-streaming";
+                streamType !== undefined
+                  ? streamType !== "no-streaming"
+                  : undefined;
               const showStillWithoutActivity =
                 currentGroupStreamingSettings?.[camera.name]?.streamType !==
                 "continuous";