From 20e5527a220a2811f020bca55ceaac59ca0ace23 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Fri, 17 Apr 2026 08:40:22 +0200
Subject: [PATCH] Ensure settings hydration only occurs if not cancelled

---
 src/GeneralSettings.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/GeneralSettings.jsx b/src/GeneralSettings.jsx
index f797903..cf7674a 100644
--- a/src/GeneralSettings.jsx
+++ b/src/GeneralSettings.jsx
@@ -126,7 +126,10 @@ export default function GeneralSettings({
           : DEFAULT_AUDIO_INPUT_LANGUAGE
       );
       setUpdateStatus(status || DEFAULT_UPDATE_STATUS);
-      setSettingsHydrated(true);
+    }).finally(() => {
+      if (!cancelled) {
+        setSettingsHydrated(true);
+      }
     });
 
     return () => {