From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Fri, 26 Sep 2014 18:15:33 +0000 (+0200)
Subject: Fix abort of machine game on variant mismatch
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=8a01d08ca804d7b67e0f20c444e4debb598a10f0;p=xboard.git

Fix abort of machine game on variant mismatch

When the second engine did not support the current variant, and we clicked
Two Machines, there was an error popup, but the Two Machines menu item
stayed checkmarked. Now we explicitly uncheck it, and switch to EditGame
mode.
---

diff --git a/backend.c b/backend.c
index 24558d5..94e6393 100644
--- a/backend.c
+++ b/backend.c
@@ -14657,8 +14657,10 @@ TwoMachinesEvent P((void))
 
     if(!SupportedVariant(second.variants, gameInfo.variant, gameInfo.boardWidth,
                          gameInfo.boardHeight, gameInfo.holdingsSize, second.protocolVersion, second.tidy)) {
-	startingEngine = FALSE;
+	startingEngine = matchMode = FALSE;
 	DisplayError("second engine does not play this", 0);
+	gameMode = TwoMachinesPlay; ModeHighlight(); // Needed to make sure menu item is unchecked
+	EditGameEvent(); // switch back to EditGame mode
 	return;
     }