Fix url-based name entry not working

tannerkrewson · Jul 28, 2024 · 1fad6a4 · 1fad6a4
1 parent f844963
commit 1fad6a4
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/pages/[gameCode].js b/pages/[gameCode].js
@@ -63,6 +63,16 @@ const Game = ({ loading }) => {
 			Swal.fire(lockedMessage(minutes)).then(() => router.push("/")),
 		);
 
+		const urlParams = new URLSearchParams(window.location.search);
+
+		const isRocketcrab = urlParams.get("rocketcrab") === "true";
+		const name = urlParams.get("name");
+
+		if (isRocketcrab && name) {
+			setIsRocketcrab(true);
+			onNameEntry(name);
+		}
+
 		return function cleanup() {
 			socket.close();
 			setGameState({ status: "loading" });
@@ -75,18 +85,6 @@ const Game = ({ loading }) => {
 		setCookie(null, "previousName", name);
 	};
 
-	useEffect(() => {
-		const urlParams = new URLSearchParams(window.location.search);
-
-		const isRocketcrab = urlParams.get("rocketcrab") === "true";
-		const name = urlParams.get("name");
-
-		if (isRocketcrab && name) {
-			setIsRocketcrab(true);
-			onNameEntry(name);
-		}
-	}, []);
-
 	const { status, me } = gameState;
 
 	const showLoading = status === "loading" || loading;