From 557cf23f71e7f6aef58407151c0a5c722d9b3f21 Mon Sep 17 00:00:00 2001
From: H3XploR <73852348+H3XploR@users.noreply.github.com>
Date: Thu, 19 Mar 2026 14:14:20 +0100
Subject: [PATCH] reset before join

---
 Transcendence/srcs/frontend/src/ui.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Transcendence/srcs/frontend/src/ui.js b/Transcendence/srcs/frontend/src/ui.js
index 01346ae..af7db65 100644
--- a/Transcendence/srcs/frontend/src/ui.js
+++ b/Transcendence/srcs/frontend/src/ui.js
@@ -113,6 +113,7 @@ btnJoinDuel.addEventListener('click', () => {
     const code = inputRoomCode.value.trim().toUpperCase();
     if (!code) return;
     if (duel) { duel.leave(); }
+    if (game.isRunning) { game.stop(); hideOverlay(); render(); updateButtons(); }
     duel = new Duel(socket, game, updateDuelStatus, startLocalGame);
     duel.join(code);
     btnJoinDuel.disabled  = true;
@@ -170,6 +171,7 @@ socket.on('tetris:matched', (data) => {
 
     // Auto-rejoindre la salle générée
     if (duel) { duel.leave(); }
+    if (game.isRunning) { game.stop(); hideOverlay(); render(); updateButtons(); }
     duel = new Duel(socket, game, updateDuelStatus, startLocalGame);
     duel.join(data.roomCode);
     inputRoomCode.value     = data.roomCode;