From 2b286ae14633e562bd5fcdcdceb9973922e29a1a Mon Sep 17 00:00:00 2001
From: Jonathan Sykes <telemagnadon@gmail.com>
Date: Wed, 7 Oct 2026 02:12:07 +0800
Subject: [PATCH] Stop the last song from restarting and freezing service-mode
 lyrics

---
 frontend/app.js                   | 3 +++
 frontend/audio-continuity.js      | 3 ++-
 frontend/audio-continuity.test.js | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/app.js b/frontend/app.js
index a213db2..8da49bd 100755
--- a/frontend/app.js
+++ b/frontend/app.js
@@ -8207,6 +8207,9 @@ function onTrackEnded() {
   if (!playFullMode && data.settings.loopOne) { Player.seek(0); Player.play(); return; }
   if (!advanceQueue()) {
     if (playFullMode) { playFullMode = false; toast('Finished playing in full'); }
+    // Nothing left: drop the intent to play, or the watchdog "resumes" the ended
+    // <audio> from 0 and the last song repeats while the lyrics stay frozen.
+    Player.pause();
     updatePlayBtn();
     $('upnext').classList.add('hidden');
   }
diff --git a/frontend/audio-continuity.js b/frontend/audio-continuity.js
index ad6fe4f..2aaccee 100644
--- a/frontend/audio-continuity.js
+++ b/frontend/audio-continuity.js
@@ -18,7 +18,8 @@
       pending.set(element, request); return request;
     }
     function resume(element, clock) {
-      if (!element || !element.paused || pending.has(element)) return;
+      // An ended element is finished, not interrupted: play() would restart it from 0.
+      if (!element || !element.paused || element.ended || pending.has(element)) return;
       if (clock && element !== clock && needsAlignment(element.currentTime, clock.currentTime)) element.currentTime = clock.currentTime;
       return play(element);
     }
diff --git a/frontend/audio-continuity.test.js b/frontend/audio-continuity.test.js
index 36073c1..3559d34 100644
--- a/frontend/audio-continuity.test.js
+++ b/frontend/audio-continuity.test.js
@@ -41,3 +41,9 @@ test('a new play after pause/source reset is not blocked by a stale promise', as
   assert.equal(controller.play(audio), fresh); // old completion cannot discard the new request
   finishes[1](); await fresh;
 });
+test('an ended element is never resumed (last song must not restart from 0)', () => {
+  let calls = 0;
+  const audio = { paused: true, ended: true, currentTime: 200, play() { calls++; return Promise.resolve(); } };
+  create().resume(audio, { currentTime: 200 });
+  assert.equal(calls, 0);
+});