Merge a741bbe7e3 into 4090592112

This reverts commit dc7791c245.

ui/src/components/WebRTCVideo.tsx

@@ -417,7 +417,7 @@ export default function WebRTCVideo({ hasConnectionIssues }: { hasConnectionIssu
       });
 
       if (isRelativeMouseMode) {
-        videoElmRefValue.addEventListener("click",
+        containerRef.current?.addEventListener("click",
           () => {
             if (isPointerLockPossible && !isPointerLockActive && !document.pointerLockElement) {
               requestPointerLock();

ui/src/routes/devices.$id.settings.advanced.tsx

@@ -313,6 +313,8 @@ export default function SettingsAdvancedRoute() {
                 text={m.advanced_reset_config_button()}
                 onClick={() => {
                   handleResetConfig();
+                  // Add 2s delay between resetting the configuration and calling reload() to prevent reload from interrupting the RPC call to reset things.
+                  await sleep(2000);
                   window.location.reload();
                 }}
               />

ui/src/routes/devices.$id.settings.general.reboot.tsx

@@ -11,6 +11,8 @@ export default function SettingsGeneralRebootRoute() {
   
   const onClose = useCallback(() => {
     navigate(".."); // back to the devices.$id.settings page
+    // Add 1s delay between navigation and calling reload() to prevent reload from interrupting the navigation.
+    await sleep(1000);
     window.location.reload(); // force a full reload to ensure the current device/cloud UI version is loaded
   }, [navigate]);
 

ui/src/routes/devices.$id.settings.general.update.tsx

@@ -23,6 +23,8 @@ export default function SettingsGeneralUpdateRoute() {
 
   const onClose = useCallback(() => {
     navigate(".."); // back to the devices.$id.settings page
+    // Add 1s delay between navigation and calling reload() to prevent reload from interrupting the navigation.
+    await sleep(1000);
     window.location.reload(); // force a full reload to ensure the current device/cloud UI version is loaded
   }, [navigate]);