Fix name already taken on refresh

tannerkrewson · Jul 28, 2024 · 109f37a · 109f37a
1 parent 7b9692b
commit 109f37a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pages/[gameCode].js b/pages/[gameCode].js
@@ -24,11 +24,18 @@ const Game = ({ loading }) => {
 	const [isRocketcrab, setIsRocketcrab] = useState(false);
 	const [isConnected, setIsConnected] = useState(socket.connected);
 
+	const cleanup = () => {
+		socket.close();
+		setGameState({ status: "loading" });
+	};
+
 	useEffect(() => {
 		const cl = socket.on("connect", () => setIsConnected(true));
+		window.addEventListener("beforeunload", cleanup);
 
 		return () => {
 			socket.off("connect", cl);
+			window.removeEventListener("beforeunload", cleanup);
 		};
 	}, []);
 
@@ -73,11 +80,6 @@ const Game = ({ loading }) => {
 			setIsRocketcrab(true);
 			onNameEntry(name);
 		}
-
-		return function cleanup() {
-			socket.close();
-			setGameState({ status: "loading" });
-		};
 	}, [isConnected]);
 
 	const onNameEntry = (name) => {