From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Wed, 3 Feb 2016 08:34:42 +0000 (+0100)
Subject: Fix demoting in Edit Position mode
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=d789fa10ca55a4a7ca9e4ed35eb38d3f25d1f09b;p=xboard.git

Fix demoting in Edit Position mode

A click on an already selected demotable piece will now cause demotion,
rather than disappearance of that piece, similar to how clicks on a
selected promotable piece will promote it.
---

diff --git a/backend.c b/backend.c
index 48a625a..8545cde 100644
--- a/backend.c
+++ b/backend.c
@@ -7075,11 +7075,9 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 	    return;
 	} else if (toX >= 0 && toY >= 0) {
 	    if(!appData.pieceMenu && toX == fromX && toY == fromY && boards[0][rf][ff] != EmptySquare) {
-		ChessSquare q, p = boards[0][rf][ff];
-		if(p >= BlackPawn) p = BLACK_TO_WHITE p;
-		if(CHUPROMOTED(p) < BlackPawn) p = q = CHUPROMOTED(boards[0][rf][ff]);
-		else p = CHUDEMOTED (q = boards[0][rf][ff]);
-		if(PieceToChar(q) == '+') gatingPiece = p;
+		ChessSquare p = boards[0][rf][ff];
+		if(PieceToChar(p) == '+') gatingPiece = CHUDEMOTED(p); else
+		if(PieceToChar(CHUPROMOTED(p)) =='+') gatingPiece = CHUPROMOTED(p); 
 	    }
 	    boards[0][toY][toX] = boards[0][fromY][fromX];
 	    if(fromX == BOARD_LEFT-2) { // handle 'moves' out of holdings