From 8c325801efba40c3a8f0f6deb28093942e7b20ba Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Thu, 30 May 2024 15:17:00 -0500
Subject: [PATCH] fix race where camera change effect sometimes was called
 after layout building (#11656)

---
 web/src/views/live/DraggableGridLayout.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/views/live/DraggableGridLayout.tsx b/web/src/views/live/DraggableGridLayout.tsx
index e5a438495..bfc644159 100644
--- a/web/src/views/live/DraggableGridLayout.tsx
+++ b/web/src/views/live/DraggableGridLayout.tsx
@@ -337,7 +337,10 @@ export default function DraggableGridLayout({
   return (
     <>
       <Toaster position="top-center" closeButton={true} />
-      {!isGridLayoutLoaded || !currentGridLayout ? (
+      {!isGridLayoutLoaded ||
+      !currentGridLayout ||
+      !isEqual(cameras, currentCameras) ||
+      includeBirdseye !== currentIncludeBirdseye ? (
         <div className="mt-2 grid grid-cols-2 gap-2 px-2 md:gap-4 xl:grid-cols-3 3xl:grid-cols-4">
           {includeBirdseye && birdseyeConfig?.enabled && (
             <Skeleton className="size-full rounded-lg md:rounded-2xl" />