From 975b0a4ff1a7578d68163f655ae518ee876da847 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Sun, 15 Jan 2023 18:07:03 -0700
Subject: [PATCH] Fix webui checks

---
 web/src/routes/Birdseye.jsx |  4 ++--
 web/src/routes/Camera.jsx   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/src/routes/Birdseye.jsx b/web/src/routes/Birdseye.jsx
index 92a0eac77..feaf6ff0e 100644
--- a/web/src/routes/Birdseye.jsx
+++ b/web/src/routes/Birdseye.jsx
@@ -36,7 +36,7 @@ export default function Birdseye() {
         </Fragment>
       );
     }
-  } else if (viewSource == 'webrtc' && config.restream.birdseye) {
+  } else if (viewSource == 'webrtc' && config.birdseye.restream) {
     player = (
       <Fragment>
         <div className="max-w-5xl">
@@ -61,7 +61,7 @@ export default function Birdseye() {
           Birdseye
         </Heading>
 
-        {config.restream.birdseye && (
+        {config.birdseye.restream && (
           <select
             className="basis-1/8 cursor-pointer rounded dark:bg-slate-800"
             value={viewSource}
diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx
index b3bf72005..f77d72330 100644
--- a/web/src/routes/Camera.jsx
+++ b/web/src/routes/Camera.jsx
@@ -23,6 +23,7 @@ export default function Camera({ camera }) {
   const apiHost = useApiHost();
   const [showSettings, setShowSettings] = useState(false);
   const [viewMode, setViewMode] = useState('live');
+  const restreamEnabled = config?.restream && Object.keys(config.restream).includes(camera);
 
   const cameraConfig = config?.cameras[camera];
   const jsmpegWidth = cameraConfig
@@ -32,8 +33,7 @@ export default function Camera({ camera }) {
     `${camera}-source`,
     getDefaultLiveMode(config, cameraConfig)
   );
-  const sourceValues =
-    config?.restream && Object.keys(config.restream).includes(camera) ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
+  const sourceValues = restreamEnabled ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
   const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject);
 
   const handleSetOption = useCallback(
@@ -107,7 +107,7 @@ export default function Camera({ camera }) {
 
   let player;
   if (viewMode === 'live') {
-    if (viewSource == 'mse' && cameraConfig.restream.enabled) {
+    if (viewSource == 'mse' && restreamEnabled) {
       if ('MediaSource' in window) {
         player = (
           <Fragment>
@@ -125,7 +125,7 @@ export default function Camera({ camera }) {
           </Fragment>
         );
       }
-    } else if (viewSource == 'webrtc' && cameraConfig.restream.enabled) {
+    } else if (viewSource == 'webrtc' && restreamEnabled) {
       player = (
         <Fragment>
           <div className="max-w-5xl">
@@ -201,9 +201,9 @@ export default function Camera({ camera }) {
   );
 }
 
-function getDefaultLiveMode(config, cameraConfig) {
+function getDefaultLiveMode(config, cameraConfig, restreamEnabled) {
   if (cameraConfig) {
-    if (cameraConfig.restream.enabled) {
+    if (restreamEnabled) {
       return config.ui.live_mode;
     }