From 8506fc3b3ecdf053689b3678584e902a8852aa47 Mon Sep 17 00:00:00 2001
From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 9 Apr 2020 17:06:47 +0200
Subject: [PATCH] Fix enter/exit analyze mode when in promotion or showing
 marks on boards

---
 client/src/components/BaseGame.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index a1af478f..1840882f 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -258,8 +258,8 @@ export default {
       else this.lastMove = null;
     },
     toggleAnalyze: function() {
-      // Autoplay has priority:
-      if (this.autoplay) return;
+      // Freeze while choices are shown (and autoplay has priority)
+      if (this.$refs["board"].choices.length > 0 || this.autoplay) return;
       if (this.mode != "analyze") {
         // Enter analyze mode:
         if (this.inMultimove) this.cancelCurrentMultimove();
@@ -282,6 +282,7 @@ export default {
         }
         this.vr = new V(fen);
         this.inMultimove = false; //in case of
+        this.$refs["board"].resetCurrentAttempt(); //also in case of
         this.incheck = this.vr.getCheckSquares();
         if (this.cursor >= 0) this.lastMove = this.moves[this.cursor];
         else this.lastMove = null;
-- 
2.44.0