From 3e0635fec3f37ff0d29cf39d16f5e68608b84a41 Mon Sep 17 00:00:00 2001
From: Matiss Jurevics <matissjurevics@gmail.com>
Date: Wed, 1 Apr 2026 17:25:00 +0100
Subject: [PATCH] fix(webapp): attach live feed when stream starts late

---
 WebApp/src/lib/app/controller.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebApp/src/lib/app/controller.js b/WebApp/src/lib/app/controller.js
index 5772f36..295a05e 100644
--- a/WebApp/src/lib/app/controller.js
+++ b/WebApp/src/lib/app/controller.js
@@ -1567,7 +1567,12 @@ const connectSocket = () => {
 
 		if (payload.cameraDeviceId === currentState.activeCameraDeviceId) {
 			setAppState({ activeStreamSessionId: payload.streamSessionId });
-			setClientStreamMode('connecting');
+			if (remoteStreams.has(payload.streamSessionId)) {
+				attachClientStreamToElement();
+				setClientStreamMode('video');
+			} else {
+				setClientStreamMode('connecting');
+			}
 		}
 
 		streamTimers.set(