X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=backend.c;h=304acc21cc5ea023eec943d5dcc5a81fe93856b5;hp=045657cc00f8a3d343ee4e5d1f751b4ce2e704ac;hb=d016fb202fe45795e630e22ba516e754cf694ea6;hpb=aa2b141fe5b67216cb63023f8c2b359e2c0a02d2

diff --git a/backend.c b/backend.c
index 045657c..304acc2 100644
--- a/backend.c
+++ b/backend.c
@@ -2444,7 +2444,7 @@ read_from_ics(isr, closure, data, count, error)
 		    }
 		}
 		if(chattingPartner<0) // if not, look if there is a chatbox for this indivdual
-		for(p=0; p<MAX_CHAT; p++) if(!strcasecmp(talker+1, chatPartner[p])) {
+		for(p=0; p<MAX_CHAT; p++) if(!StrCaseCmp(talker+1, chatPartner[p])) {
 		    talker[0] = 0;
 		    chattingPartner = p; break;
 		}
@@ -4557,7 +4557,6 @@ InitPosition(redraw)
     oldh = gameInfo.holdingsWidth,
     oldv = gameInfo.variant;
 
-    currentMove = forwardMostMove = backwardMostMove = 0;
     if(appData.icsActive) shuffleOpenings = FALSE; // [HGM] shuffle: in ICS mode, only shuffle on ICS request
 
     /* [AS] Initialize pv info list [HGM] and game status */
@@ -5159,6 +5158,12 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar)
 		    fprintf(debugFP, "Got premove: fromX %d,"
 			    "fromY %d, toX %d, toY %d\n",
 			    fromX, fromY, toX, toY);
+		if(!WhiteOnMove(currentMove) && gotPremove == 1) {
+		    // [HGM] race: we must have been hit by an opponent move from the ICS while preparing the premove
+		    if (appData.debugMode) 
+			fprintf(debugFP, "Execute as normal move\n");
+		    gotPremove = 0; break;
+		}
 	    }
             return ImpossibleMove;
 	}
@@ -5180,6 +5185,12 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar)
 		    fprintf(debugFP, "Got premove: fromX %d,"
 			    "fromY %d, toX %d, toY %d\n",
 			    fromX, fromY, toX, toY);
+		if(WhiteOnMove(currentMove) && gotPremove == 1) {
+		    // [HGM] race: we must have been hit by an opponent move from the ICS while preparing the premove
+		    if (appData.debugMode) 
+			fprintf(debugFP, "Execute as normal move\n");
+		    gotPremove = 0; break;
+		}
 	    }
             return ImpossibleMove;
 	}
@@ -8281,6 +8292,7 @@ Reset(redraw, init)
     gameMode = BeginningOfGame;
     ModeHighlight();
     if(appData.icsActive) gameInfo.variant = VariantNormal;
+    currentMove = forwardMostMove = backwardMostMove = 0;
     InitPosition(redraw);
     for (i = 0; i < MAX_MOVES; i++) {
 	if (commentList[i] != NULL) {