From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Sat, 8 Dec 2018 13:24:10 +0000 (+0100)
Subject: Refrain from starting analysis search if all moves excluded
X-Git-Tag: v4.0~10
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=97e74bb8982f9fd78654a4f2b8a7619969a3414a;p=uci2wb.git

Refrain from starting analysis search if all moves excluded

LaunchSearch() now tests for any moves being still enabled before
starting an analysis search. (If there aren't sm == 1.) This means the
last reason to skip LaunchSearch() after DoCommand() has disappeared.
---

diff --git a/UCI2WB.c b/UCI2WB.c
index 41c71c8..81a7e5f 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -415,7 +415,7 @@ Move4Engine(char *m)
     }
 }
 
-int DoCommand ();
+void DoCommand ();
 char mySide;
 volatile char queue[10000], *qStart, *qEnd;
 
@@ -424,7 +424,7 @@ LaunchSearch()
 {
     int i;
 
-	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
+	if((computer == stm || computer == ANALYZE && !searching && sm != 1) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -520,14 +520,14 @@ GUI2Engine()
     }
 }
 
-int
+void
 DoCommand ()
 {
     char line[1024], command[256], *p, *q, *r, type[99];
     int i;
 
     p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
-    if(line[0] == '\n') return 0;
+    if(line[0] == '\n') return;
     sscanf(line, "%s", command);
 
 	if(!strcmp(command, "new")) {
@@ -594,7 +594,6 @@ DoCommand ()
 	    int all = !strcmp(line+8, "all"), in = command[1] == 'n';
 	    inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag
 	    for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled
-	    if(!(sm & 2)) return 1; // no moves enabled; continue current search
 	}
 	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0, Analyze("true");
@@ -618,8 +617,6 @@ DoCommand ()
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
-
-    return 0;
 }
 
 void *
@@ -630,7 +627,7 @@ Engine2GUI()
 	if(searching > 1) HandleEngineOutput();  // this could leave us (or fall through) pondering
 	while(qStart == qEnd && searching) HandleEngineOutput(); // relay ponder output until command arrives
 	Sync(PAUSE); // possibly wait for command silently if engine is idle
-	if(!DoCommand()) LaunchSearch();
+	DoCommand(); LaunchSearch();
     }
 }