From 71eb1a0763a31eb2762ee5d1893f50eca05a5d0c Mon Sep 17 00:00:00 2001
From: SimolZimol <70102430+SimolZimol@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:15:47 +0200
Subject: [PATCH] 	modified:   templates/quiz_multiplayer.html

---
 templates/quiz_multiplayer.html | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/templates/quiz_multiplayer.html b/templates/quiz_multiplayer.html
index accd9f0..fd35d22 100644
--- a/templates/quiz_multiplayer.html
+++ b/templates/quiz_multiplayer.html
@@ -57,10 +57,12 @@
 {% endblock %}
 {% block extra_body %}
 <script>
-// Multiplayer-Daten IMMER beim Laden löschen, damit Popup immer erscheint
-localStorage.removeItem('quizify_multiplayer_names');
-localStorage.removeItem('quizify_multiplayer_scores');
-localStorage.removeItem('quizify_multiplayer_current');
+// Multiplayer-Daten NUR löschen, wenn keine Spielernamen gesetzt sind
+if (!localStorage.getItem('quizify_multiplayer_names')) {
+  localStorage.removeItem('quizify_multiplayer_names');
+  localStorage.removeItem('quizify_multiplayer_scores');
+  localStorage.removeItem('quizify_multiplayer_current');
+}
 </script>
 {% if local_multiplayer %}
 <div id="multiplayerPopup" style="position:fixed;top:0;left:0;width:100vw;height:100vh;background:rgba(0,0,0,0.7);display:flex;align-items:center;justify-content:center;z-index:2000;">
@@ -104,6 +106,7 @@ let correctAnswer = "";
 const i18n = {{ translations|tojson }};
 
 window.onSpotifyWebPlaybackSDKReady = () => {
+  // Musik und Quiz werden erst nach quizifyReady() gestartet!
   const token = '{{ access_token }}';
   const player = new Spotify.Player({
     name: 'Musik Quiz Player',
@@ -276,9 +279,13 @@ window.onload = function() {
   }
   document.getElementById('startPosition').value = getOption('startPosition', 'start');
 
-  // Popup immer anzeigen, weil LocalStorage oben geleert wurde
-  if (document.getElementById('multiplayerPopup')) {
+  // Popup anzeigen, wenn keine Spielernamen gesetzt sind
+  if (!localStorage.getItem('quizify_multiplayer_names') && document.getElementById('multiplayerPopup')) {
     document.getElementById('multiplayerPopup').style.display = 'flex';
+  } else {
+    // Wenn Namen schon gesetzt, direkt Quiz starten
+    updateMultiplayerUI();
+    quizifyReady();
   }
 };