From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Wed, 18 Feb 2015 21:49:20 +0000 (+0100)
Subject: Suppress appearance of promotion popup when sweep-selecting
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=c0b6d3079c133f9e21766f500feed1c81bf3cafb

Suppress appearance of promotion popup when sweep-selecting

In highlight-induced promotions the popup would appear even when it
should have been off.
---

diff --git a/backend.c b/backend.c
index d8b85a1..ad78134 100644
--- a/backend.c
+++ b/backend.c
@@ -7732,7 +7732,7 @@ printf("(%d,%d)-(%d,%d) %d %d\n",fromX,fromY,toX,toY,x,y);
 
     if(legal[toY][toX] == 2) promoChoice = ToLower(PieceToChar(defaultPromoChoice)); // highlight-induced promotion
 
-    if (legal[toY][toX] == 2 || HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, appData.sweepSelect)) {
+    if (legal[toY][toX] == 2 && !appData.sweepSelect || HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, appData.sweepSelect)) {
 	SetHighlights(fromX, fromY, toX, toY);
         MarkTargetSquares(1);
 	if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat || gameInfo.variant == VariantGrand) {