From c1ebb6cfe5b5f15ef7edd63df4d5d0c34f78ed0c Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Tue, 14 Apr 2026 03:02:25 +0200
Subject: [PATCH] Update runtime control state synchronization and refresh
 logic

---
 src/runtime-three/runtime-host.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/runtime-three/runtime-host.ts b/src/runtime-three/runtime-host.ts
index dbf54397..94da8822 100644
--- a/src/runtime-three/runtime-host.ts
+++ b/src/runtime-three/runtime-host.ts
@@ -2614,11 +2614,14 @@ export class RuntimeHost {
       }
     }
 
-    this.runtimeScene.scheduler.resolved = nextResolvedScheduler;
-    this.runtimeScene.control.resolved = applyRuntimeProjectScheduleToControlState(
+    const nextResolvedControl = applyRuntimeProjectScheduleToControlState(
       this.runtimeScene.control.resolved,
-      nextResolvedScheduler
+      nextResolvedScheduler,
+      this.runtimeScene.control.baselineResolved
     );
+    this.syncResolvedControlStateToRuntime(nextResolvedControl);
+    this.runtimeScene.scheduler.resolved = nextResolvedScheduler;
+    this.runtimeScene.control.resolved = nextResolvedControl;
 
     if (changed) {
       this.refreshRuntimeNpcCollections();