diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index be01f48c7..acbf55669 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -271,7 +271,6 @@ pub fn run() { // Clone settings for use in closures let enable_tray = tray_settings.enable_tray; - let close_to_tray = tray_settings.close_to_tray; // Initialize per-user data paths (no user active yet until login) let user_data_paths = user_data::UserDataPaths::new(); @@ -422,8 +421,14 @@ pub fn run() { Ok(()) }) .on_window_event(move |window, event| { - // Handle close to tray + // Handle close to tray — read dynamically from state so per-user + // settings take effect after login without needing a restart. if let tauri::WindowEvent::CloseRequested { api, .. } = event { + let close_to_tray = window.app_handle() + .try_state::() + .and_then(|state| state.get_settings().ok()) + .map(|s| s.close_to_tray) + .unwrap_or(false); if close_to_tray { log::info!("Close to tray: hiding window instead of closing"); let _ = window.hide(); diff --git a/src/lib/components/TitleBar.svelte b/src/lib/components/TitleBar.svelte index a242037ec..01e634b5b 100644 --- a/src/lib/components/TitleBar.svelte +++ b/src/lib/components/TitleBar.svelte @@ -43,6 +43,12 @@ }); async function handleMinimize() { + // Re-read setting to pick up per-user value after login + try { + const settings = await invoke('get_tray_settings'); + minimizeToTray = settings.minimize_to_tray; + } catch {} + if (minimizeToTray) { await appWindow?.hide(); } else { diff --git a/src/lib/stores/playerStore.ts b/src/lib/stores/playerStore.ts index 83d33d4b2..12039e0f5 100644 --- a/src/lib/stores/playerStore.ts +++ b/src/lib/stores/playerStore.ts @@ -426,6 +426,22 @@ export async function seek(position: number): Promise { } } +/** + * Re-read volume from localStorage after user-scoped storage becomes available. + * Called after login sets the userId, so getUserItem reads the correct scoped key. + */ +export async function resyncPersistedVolume(): Promise { + const persistedVolume = loadPersistedVolume(); + volume = persistedVolume; + notifyListeners(); + try { + await invoke('set_volume', { volume: persistedVolume / 100 }); + console.log('[Player] Resynced volume after login:', persistedVolume); + } catch { + console.debug('[Player] Could not resync volume to backend'); + } +} + /** * Set volume (0-100) * Always persists the volume, even when nothing is playing. @@ -692,6 +708,8 @@ export async function startPolling(): Promise { // Sync persisted volume to backend on startup // This ensures the backend knows the saved volume before any playback starts + // Note: at this point userId may not be set yet, so the volume may come from + // the unscoped key. resyncPersistedVolume() is called after login to fix this. const persistedVolume = loadPersistedVolume(); try { await invoke('set_volume', { volume: persistedVolume / 100 }); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index a5d319de6..3b5e1232e 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -149,6 +149,7 @@ reset as resetPlayer, getPlayerState, getVolume, + resyncPersistedVolume, type PlayingTrack, type PlayerState } from '$lib/stores/playerStore'; @@ -2267,6 +2268,9 @@ migrateLocalStorage(info.userId); } + // Re-sync volume from the now-correct user-scoped localStorage key + await resyncPersistedVolume(); + // Activate per-user backend state (LoginView already did this for auto-login, // but we call again to ensure it's active for manual login too — it's idempotent) if (info.userId) {