diff --git a/src/lib/stores/playerStore.ts b/src/lib/stores/playerStore.ts index 5335ac5ba..ebb248183 100644 --- a/src/lib/stores/playerStore.ts +++ b/src/lib/stores/playerStore.ts @@ -134,6 +134,7 @@ let queueEnded = false; // Callbacks for track advancement (set by consumer) let onTrackEnded: (() => Promise) | null = null; +let onResumeFromStop: (() => Promise) | null = null; // Session restore state - when set, next play will load the track first let pendingSessionRestore: { trackId: number; position: number } | null = null; @@ -286,7 +287,13 @@ export function hasPendingSessionRestore(): boolean { * Toggle play/pause */ export async function togglePlay(): Promise { - if (!currentTrack) return; + if (!currentTrack) { + // After stop, try to resume from the queue's current track + if (onResumeFromStop) { + await onResumeFromStop(); + } + return; + } const newIsPlaying = !isPlaying; isPlaying = newIsPlaying; @@ -453,6 +460,13 @@ export async function stop(): Promise { // ============ Event-Based Updates ============ +/** + * Set callback for resuming playback after stop (re-play current queue track) + */ +export function setOnResumeFromStop(callback: () => Promise): void { + onResumeFromStop = callback; +} + /** * Set callback for when track ends (for auto-advance) */ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 9a4e4807b..535c58639 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -130,6 +130,7 @@ setIsSkipping, setQueueEnded, setOnTrackEnded, + setOnResumeFromStop, togglePlay, seek as playerSeek, setVolume as playerSetVolume, @@ -2677,6 +2678,15 @@ } }); + // Set up resume-from-stop callback: re-play the queue's current track + setOnResumeFromStop(async () => { + const queueState = await getBackendQueueState(); + if (queueState?.current_track && queueState.current_index !== null) { + console.log('[Player] Resuming from stop, replaying queue index:', queueState.current_index); + await playQueueTrack(queueState.current_track); + } + }); + // Set up tray icon event listeners let unlistenTrayPlayPause: UnlistenFn | null = null; let unlistenTrayNext: UnlistenFn | null = null;