Erase markers before processing highlight FEN

[xboard.git] / backend.c

diff --git a/backend.c b/backend.c
index a67ca7c..241bf96 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -7399,11 +7399,10 @@ MarkByFEN(char *fen)
 {
        int r, f;
        if(!appData.markers || !appData.highlightDragging) return;
-       for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) legal[r][f] = 0;
+       for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) legal[r][f] = marker[r][f] = 0;
        r=BOARD_HEIGHT-1-deadRanks; f=BOARD_LEFT;
        while(*fen) {
            int s = 0;
-           marker[r][f] = 0;
            if(*fen == 'M') legal[r][f] = 2; else // request promotion choice
            if(*fen == 'B') legal[r][f] = 4; else // request auto-promotion to victim
            if(*fen >= 'A' && *fen <= 'Z') legal[r][f] = 3; else
@@ -19109,7 +19108,7 @@ LoadTheme ()
          if(appData.trueColors != 2) // 2 is a kludge to suppress this in WinBoard
            snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -trueColors %s", appData.trueColors ? "true" : "false");
        }
-       if(!appData.pieceDirectory[0] && !appData.trueColors)
+       if(!appData.pieceDirectory[0] || !appData.trueColors)
          snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -wpc %s -bpc %s",
                Col2Text(0),   // whitePieceColor
                Col2Text(1) ); // blackPieceColor