X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=abf193607df55a3310e7b940b77e8b05cb78da09;hb=6f3c9bba464d20c0abff140f3f7a6ccd0291253b;hp=ca2625c8c85fbbd25c30421df7545e472b31ab95;hpb=00556ac3560be0593108590342e5d44595743821;p=xboard.git

diff --git a/moves.c b/moves.c
index ca2625c..abf1936 100644
--- a/moves.c
+++ b/moves.c
@@ -261,6 +261,7 @@ LoadPieceDesc (char *s)
 	    ASSIGN(pieceDesc[WHITE_TO_BLACK piece], p);
 	}
 	pieceDefs = TRUE;
+	if(q) *q = ';';
     }
     return ok;
 }
@@ -2057,7 +2058,7 @@ DisambiguateCallback (Board board, int flags, ChessMove kind, int rf, int ff, in
 	(cl->rtIn == -1 || cl->rtIn == rt || wildCard) &&
 	(cl->ftIn == -1 || cl->ftIn == ft || wildCard)) {
 
-	if(cl->count && rf == cl->rf && ff == cl->ff) return; // duplicate move
+	if(cl->count && rf == cl->rf && ff == cl->ff && rt == cl->rt && ft == cl->ft) return; // duplicate move
 
 	if(cl->count == 1 && kifu & 0x7E && cl->rfIn == -1 && cl->ffIn == -1) { // traditional Shogi disambiguation required
 	    int this = 1, other = 1;