From 2dc57915be6c94ec109156bd59f83b118ab0a70f Mon Sep 17 00:00:00 2001
From: jessy-david-dev <ultralionfr@gmail.com>
Date: Wed, 15 Apr 2026 18:47:54 +0200
Subject: [PATCH] fix(multi): don't override screen if a new room was joined
 during session restore

---
 lib/useGameEffects.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/useGameEffects.ts b/lib/useGameEffects.ts
index fcf41e3..b604b6d 100644
--- a/lib/useGameEffects.ts
+++ b/lib/useGameEffects.ts
@@ -57,7 +57,11 @@ export function useGameEffects({
       saved.multiPlayerId
     ) {
       if (saved.playerName) setPlayerName(saved.playerName);
+      const savedCode = saved.multiRoomCode;
       multi.restore(saved.multiRoomCode, saved.multiPlayerId).then((ok) => {
+        // si une nouvelle room a été rejointe pendant le restore, on laisse
+        const current = loadSession();
+        if (current?.multiRoomCode && current.multiRoomCode !== savedCode) return;
         if (ok) setScreen("lobby");
         else {
           clearSession();