X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=7cdf340c0a63cd8c597b01260388d11f602233c5;hp=0a1de9fe59caca1344ded1b7680951f396b15529;hb=HEAD;hpb=35910dfcb34a442657bb5508cda8059f9f0ba32c

diff --git a/UCI2WB.c b/UCI2WB.c
index 0a1de9f..7cdf340 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "3.0"
+#define VERSION "4.0"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -188,6 +188,7 @@ StartPonder(int moveNr)
 	if(!move[moveNr][0]) return; // no ponder move
 	LoadPos(moveNr+1);
 	searching = 1; lastDepth = 1;
+	DPRINT("# ponder on %s\n", move[moveNr]);
 	StartSearch(" ponder");
 }
 
@@ -266,10 +267,7 @@ HandleEngineOutput()
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
 	      sscanf(p+7, "%s", move[moveNr]);
-	      if(computer != NONE && ponder) {
-		DPRINT("# ponder on %s\n", move[moveNr]);
-		StartPonder(moveNr);
-	      }
+	      if(computer != NONE && ponder) StartPonder(moveNr);
 	      p[-1] = '\n'; *p = 0; // strip off ponder move
 	    } else move[moveNr][0] = 0;
 	    Move4GUI(line+9);
@@ -371,6 +369,7 @@ HandleEngineOutput()
 		    sprintf(buf + strlen(buf), "%s%s%s", min++ ? " /// " : " ", strcmp(type, val) ? "" : "*", val);
 		}
 		strcat(q, "\"\n");
+
 	    }
 	    else buf[0] = 0; // ignore unrecognized option types
 	    if(buf[0]) printf("%s", buf);
@@ -424,7 +423,9 @@ LaunchSearch()
 {
     int i;
 
-	if((computer == stm || computer == ANALYZE && !searching && sm != 1) && !suspended) {
+    if(suspended || searching) return;
+
+	if(computer == stm || computer == ANALYZE && sm != 1) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -438,6 +439,7 @@ LaunchSearch()
 		EPRINT((f, "\n")) searching = 2; // suppresses spurious commands during analysis starting new searches
 	    } else searching = 3, StartSearch(""); // request suspending of input processing while thinking
 	} else if(ponderAlways && computer == NONE) move[moveNr][0] = 0, StartPonder(moveNr-1);
+	else if(BLACK+WHITE-stm == computer && ponder && moveNr) StartPonder(moveNr);
 }
 
 void