From f883c91b1e7c84898a2a5182db031060ab4907d3 Mon Sep 17 00:00:00 2001
From: tiennm99 <tiennm99@outlook.com>
Date: Sun, 26 Jul 2026 00:35:36 +0700
Subject: [PATCH] fix(audio): start background music after a blocked autoplay
 retry

activeTrack was assigned before play() could reject, so the retry bound to
the first user gesture hit the same-track early return and menu music never
started on any browser that blocks autoplay. Also drops crossOrigin, which
is inert for same-origin audio but forces CORS-mode fetches through the
service worker and breaks file:// use.
---
 src/lib/bgm.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/bgm.js b/src/lib/bgm.js
index d8f1ff1..926ed3c 100644
--- a/src/lib/bgm.js
+++ b/src/lib/bgm.js
@@ -72,7 +72,6 @@ function makeAudio(url) {
     const a = new Audio(url);
     a.loop = true;
     a.preload = 'auto';
-    a.crossOrigin = 'anonymous';
     a.volume = 0; // start silent, fade in
     return a;
 }
@@ -122,7 +121,6 @@ function fadeOut(audio, durationMs = 600) {
 export async function playBgm(trackName, { fadeMs = 600 } = {}) {
     const url = trackName ? BGM_TRACKS[trackName] : null;
     if (url === activeTrack) return; // already playing
-    activeTrack = url;
 
     if (fading) {
         cancelFade(fading);
@@ -130,6 +128,7 @@ export async function playBgm(trackName, { fadeMs = 600 } = {}) {
     }
 
     if (!url) {
+        activeTrack = null;
         // Fade out current, then drop
         if (current) {
             const c = current;
@@ -144,11 +143,13 @@ export async function playBgm(trackName, { fadeMs = 600 } = {}) {
     try {
         await next.play();
     } catch (e) {
-        // Autoplay blocked — wait for first user interaction.
-        // We'll retry on the next user gesture; track the intent.
+        // Autoplay blocked — wait for first user interaction. Do NOT mark
+        // this track as active: if we did, the gesture-triggered retry below
+        // would hit the early-return above and silently never call play().
         pendingPlay = trackName;
         return;
     }
+    activeTrack = url;
     fadeIn(next, effectiveVolume(), fadeMs);
 
     if (current) {