From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Fri, 13 Apr 2012 17:06:17 +0000 (+0200)
Subject: Fix promotionPopDown on new move entry
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=0d5d98e82dac22b0873aaf9fea8a1b13e1f9f349;p=xboard.git

Fix promotionPopDown on new move entry

The promotion popup is non-modal, and old XBoard versions popped it down
as soon as the user clicked the board, so he could just enter a new move
to abort the promotion. This was broken in the new version, because the code
to do the PopDown and abort in HandleUserMove had not been ported.
---

diff --git a/dialogs.c b/dialogs.c
index c8c7fc2..726574c 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -1911,6 +1911,7 @@ Exp (int n, int x, int y)
 	if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
 	return NULL;
     }
+    if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up
     shiftKey = ShiftKeys();
     controlKey = (shiftKey & 0xC) != 0;
     shiftKey = (shiftKey & 3) != 0;