diff --git a/src/lib/services/updatesService.ts b/src/lib/services/updatesService.ts index 5d0cd0702..fe2756530 100644 --- a/src/lib/services/updatesService.ts +++ b/src/lib/services/updatesService.ts @@ -10,6 +10,7 @@ import { ignoreRelease, initUpdatesStore, markWhatsNewShown, + refreshUpdatePreferences, setCheckOnLaunch, } from '$lib/stores/updatesStore'; import type { ReleaseInfo } from '$lib/stores/updatesStore'; @@ -175,6 +176,10 @@ export async function decideLaunchModals(): Promise { ensureSessionId(); await initUpdatesStore(); + // Always refresh preferences from the backend to ensure we have + // the user's saved settings (initUpdatesStore may have loaded + // defaults if the session wasn't ready on first call). + await refreshUpdatePreferences(); const prefs = getPreferences(); const currentVersion = getCurrentVersion(); diff --git a/src/lib/stores/updatesStore.ts b/src/lib/stores/updatesStore.ts index 91dae276e..15919812d 100644 --- a/src/lib/stores/updatesStore.ts +++ b/src/lib/stores/updatesStore.ts @@ -30,7 +30,8 @@ let preferences: UpdatePreferences = { }; let currentVersion = ''; -let initialized = false; +let versionLoaded = false; +let prefsLoaded = false; const listeners = new Set<() => void>(); @@ -55,23 +56,27 @@ export function getCurrentVersion(): string { } export async function initUpdatesStore(): Promise { - if (initialized) return; - initialized = true; - // get_current_version never needs a session (compile-time value). - // get_update_preferences needs the SQLite store which is only - // available after login. Fetch them independently so a preference - // failure doesn't lose the version. - try { - currentVersion = await invoke('get_current_version'); - } catch (error) { - console.error('[Updates] Failed to get current version:', error); + // Only fetch once. + if (!versionLoaded) { + try { + currentVersion = await invoke('get_current_version'); + versionLoaded = true; + } catch (error) { + console.error('[Updates] Failed to get current version:', error); + } } - try { - preferences = await invoke('get_update_preferences'); - } catch { - // Expected before login — store not initialised yet. + // get_update_preferences needs the SQLite store which is only + // available after login. Retry on each call until it succeeds, + // so a pre-login failure doesn't lock in stale defaults. + if (!prefsLoaded) { + try { + preferences = await invoke('get_update_preferences'); + prefsLoaded = true; + } catch { + // Expected before login — store not initialised yet. + } } notify(); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 554183c07..e58566c67 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -323,6 +323,7 @@ import KeyboardShortcutsModal from '$lib/components/KeyboardShortcutsModal.svelte'; import KeybindingsSettings from '$lib/components/KeybindingsSettings.svelte'; import type { ReleaseInfo } from '$lib/stores/updatesStore'; + import { refreshUpdatePreferences } from '$lib/stores/updatesStore'; import { decideLaunchModals, disableUpdateChecks, @@ -2207,6 +2208,7 @@ initOfflineCacheStates(); // has internal try/catch initPlaybackPreferences().catch(err => console.debug('[PlaybackPrefs] Init deferred:', err)); initBlacklistStore().catch(err => console.debug('[Blacklist] Init deferred:', err)); + refreshUpdatePreferences().catch(err => console.debug('[Updates] Prefs refresh deferred:', err)); // Load favorites now that login is confirmed (sync with Qobuz) loadFavorites(); // Track favorites