retrieve game number from message

diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index 8fd47e833220c87c146f2186cd00bbe61196aa0b..97c9862598e70a14788471c6d9ea35b3e08a6261 100644 (file)
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -480,16 +480,22 @@ function countTiles(rack) {
 
 function joinGame(gameNumber, message) {
     if (!gameNumber) {
-        gameNumber = newGameId();
-        if (message) {
-            //message.gameNumber = gameNumber;
-            gameNumber = message.gameNumber;
-        }
+        gameNumber = ((message) && (parseInt(message.gameNumber) > 0)) ? message.gameNumber : newGameId();
     }
+    message.gameNumber = gameNumber;
+
 
-    let game = games[gameNumber] || (games[gameNumber] = new Game());
-    if ((message) && (message.bagFactor) && (message.bagFactor != game.factor)) {
-        game.init(message.boardLang, message.boardLabel, message.bagFactor);
+    let game;
+    if (games[gameNumber]) {
+        debuglog("Load game: ", gameNumber);
+        game = games[gameNumber];
+    } else {
+        debuglog("Create new game: ", gameNumber);
+        game = games[gameNumber] = new Game();
+        if ((message) && (message.boardLang) && (message.boardLabel) && (message.bagFactor) &&
+            ((message.boardLang !== game.lang) || (message.boardLabel !== game.label) || (message.bagFactor !== game.factor))) {
+            game.init(message.boardLang, message.boardLabel, message.bagFactor);
+        }
     }
 
     return {gameNumber, game};