Attempt to fix the non-transmitted moves issue

[vchess.git] / public / javascripts / components / game.js

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 9e00d12..42e6507 100644 (file)
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -378,7 +378,7 @@ Vue.component('my-game', {
                        {
                                // New game request has been cancelled on disconnect
                                this.seek = true;
-                               this.newGame("human");
+                               this.newGame("human", "reconnect");
                        }
                };
                const socketMessageListener = msg => {
@@ -466,6 +466,13 @@ Vue.component('my-game', {
                        this.score = "*";
                        if (mode=="human" && !oppId)
                        {
+                               const storageVariant = localStorage.getItem("variant");
+                               if (!!storageVariant && storageVariant !== variant)
+                               {
+                                       // TODO: find a better way to ensure this. Newgame system is currently a mess.
+                                       alert("Finish your " + storageVariant + " game first!");
+                                       return;
+                               }
                                // Send game request and wait..
                                this.clearStorage(); //in case of
                                try {
@@ -473,9 +480,12 @@ Vue.component('my-game', {
                                } catch (INVALID_STATE_ERR) {
                                        return; //nothing achieved
                                }
-                               let modalBox = document.getElementById("modal-control2");
-                               modalBox.checked = true;
-                               setTimeout(() => { modalBox.checked = false; }, 2000);
+                               if (!fenInit || fenInit!="reconnect") //TODO: bad HACK...
+                               {
+                                       let modalBox = document.getElementById("modal-control2");
+                                       modalBox.checked = true;
+                                       setTimeout(() => { modalBox.checked = false; }, 2000);
+                               }
                                return;
                        }
                        this.vr = new VariantRules(fen, moves || []);