From ea88aa095f740af0dd734785c3ccdd483a6ceecf Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Sun, 15 Jan 2023 17:57:18 -0700
Subject: [PATCH] Fix camera webUI

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

diff --git a/web/src/routes/Birdseye.jsx b/web/src/routes/Birdseye.jsx
index 6571d8eab..92a0eac77 100644
--- a/web/src/routes/Birdseye.jsx
+++ b/web/src/routes/Birdseye.jsx
@@ -18,7 +18,7 @@ export default function Birdseye() {
   }
 
   let player;
-  if (viewSource == 'mse' && config.restream.birdseye) {
+  if (viewSource == 'mse' && config.birdseye.restream) {
     if ('MediaSource' in window) {
       player = (
         <Fragment>
diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx
index 8d9c0dd44..b3bf72005 100644
--- a/web/src/routes/Camera.jsx
+++ b/web/src/routes/Camera.jsx
@@ -26,13 +26,14 @@ export default function Camera({ camera }) {
 
   const cameraConfig = config?.cameras[camera];
   const jsmpegWidth = cameraConfig
-    ? Math.round(cameraConfig.restream.jsmpeg.height * (cameraConfig.detect.width / cameraConfig.detect.height))
+    ? Math.round(cameraConfig.live.height * (cameraConfig.detect.width / cameraConfig.detect.height))
     : 0;
   const [viewSource, setViewSource, sourceIsLoaded] = usePersistence(
     `${camera}-source`,
     getDefaultLiveMode(config, cameraConfig)
   );
-  const sourceValues = cameraConfig && cameraConfig.restream.enabled ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
+  const sourceValues =
+    config?.restream && Object.keys(config.restream).includes(camera) ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
   const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject);
 
   const handleSetOption = useCallback(
@@ -136,7 +137,7 @@ export default function Camera({ camera }) {
       player = (
         <Fragment>
           <div>
-            <JSMpegPlayer camera={camera} width={jsmpegWidth} height={cameraConfig.restream.jsmpeg.height} />
+            <JSMpegPlayer camera={camera} width={jsmpegWidth} height={cameraConfig.live.height} />
           </div>
         </Fragment>
       );