X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=0328a586f4380ae7cacf6893ff8c7e8680ad9af1;hb=5d34e50444d0107bfe7d10ea2a38b003d130df24;hp=79774fa7003ea717deb6d23389dd602b580be281;hpb=7937bbea6d9e0644cd8a5c39e2c6d6320368945a;p=xboard.git

diff --git a/backend.c b/backend.c
index 79774fa..0328a58 100644
--- a/backend.c
+++ b/backend.c
@@ -940,8 +940,19 @@ FloatToFront(char **list, char *engineLine)
 }
 
 void
+SaveEngineList ()
+{
+	FILE *f;
+	if(*engineListFile && (f = fopen(engineListFile, "w"))) {
+	  fprintf(f, "-firstChessProgramNames {%s}\n", firstChessProgramNames);
+	  fclose(f);
+	}
+}
+
+void
 AddToEngineList (int i)
 {
+    if(addToList) {
 	int len;
 	char quote, buf[MSG_SIZ];
 	char *q = firstChessProgramNames, *p = newEngineCommand;
@@ -962,8 +973,10 @@ AddToEngineList (int i)
 	if(insert != q) insert[-1] = NULLCHAR;
 	snprintf(firstChessProgramNames, len, "%s\n%s\n%s", q, buf, insert);
 	if(q) 	free(q);
+	SaveEngineList();
 	FloatToFront(&appData.recentEngineList, buf);
 	ASSIGN(currentEngine[i], buf);
+    }
 }
 
 void
@@ -972,7 +985,7 @@ LoadEngine ()
     int i;
     if(WaitForEngine(savCps, LoadEngine)) return;
     if(tryNr == 1 && !isUCI) { SendToProgram("uci\n", savCps); tryNr = 2; ScheduleDelayedEvent(LoadEngine, FEATURE_TIMEOUT); return; }
-    if(tryNr) v1 = (tryNr == 2), tryNr = 0, AddToEngineList(0); // deferred to after protocol determination
+    if(tryNr) v1 |= (tryNr == 2), tryNr = 0, AddToEngineList(0); // deferred to after protocol determination
     CommonEngineInit(); // recalculate time odds
     if(gameInfo.variant != StringToVariant(appData.variant)) {
 	// we changed variant when loading the engine; this forces us to reset
@@ -1001,7 +1014,7 @@ ReplaceEngine (ChessProgramState *cps, int n)
     appData.clockMode = TRUE;
     InitEngine(cps, n);
     UpdateLogos(TRUE);
-    if(n) return; // only startup first engine immediately; second can wait
+    if(n && !tryNr) return; // only startup first engine immediately; second can wait (unless autodetect)
     savCps = cps; // parameter to LoadEngine passed as globals, to allow scheduled calling :-(
     LoadEngine();
 }
@@ -1049,13 +1062,14 @@ Load (ChessProgramState *cps, int i)
     }
     if(jar) { snprintf(buf3, MSG_SIZ, "java -jar %s", p); p = buf3; }
     ASSIGN(appData.chessProgram[i], p);
+    tryNr = 3; // requests adding to list without auto-detect
+    if(isUCI == 3) tryNr = 1, isUCI = 0; // auto-detect
     appData.isUCI[i] = isUCI;
     appData.protocolVersion[i] = v1 ? 1 : PROTOVER;
     appData.hasOwnBookUCI[i] = hasBook;
     if(!nickName[0]) useNick = FALSE;
     if(useNick) ASSIGN(appData.pgnName[i], nickName);
     safeStrCpy(newEngineCommand, p, MSG_SIZ);
-    tryNr = 1;
     ReplaceEngine(cps, i);
 }
 
@@ -9234,7 +9248,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	cps->useSigterm = FALSE;
     }
     if (strncmp(message, "feature ", 8) == 0) { // [HGM] moved forward to pre-empt non-compliant commands
-      ParseFeatures(message+8, cps); if(tryNr < 3) tryNr = 3;
+      ParseFeatures(message+8, cps); if(tryNr && tryNr < 3) tryNr = 3;
       return; // [HGM] This return was missing, causing option features to be recognized as non-compliant commands!
     }
 
@@ -9446,8 +9460,9 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	return;
     }
     if(strncmp(message, "uciok", 5) == 0) { // response to "uci" probe
-	appData.isUCI[0] = isUCI = 1;
-	ReplaceEngine(&first, 0); // retry install as UCI
+	int nr = (cps == &second);
+	appData.isUCI[nr] = isUCI = 1;
+	ReplaceEngine(cps, nr); // retry install as UCI
 	return;
     }
     /*
@@ -11390,6 +11405,7 @@ SaveEngineSettings (int n)
 {
     int len; char *p, *q, *s, buf[MSG_SIZ], *optionSettings;
     if(!currentEngine[n] || !currentEngine[n][0]) { DisplayMessage("saving failed: engine not from list", ""); return; } // no engine from list is loaded
+    if(*engineListFile) ParseSettingsFile(engineListFile, &engineListFile); // update engine list
     p = strstr(firstChessProgramNames, currentEngine[n]);
     if(!p) { DisplayMessage("saving failed: engine not found in list", ""); return; } // sanity check; engine could be deleted from list after loading
     optionSettings = ResendOptions(n ? &second : &first, FALSE);
@@ -11409,6 +11425,7 @@ SaveEngineSettings (int n)
     s = malloc(len);
     snprintf(s, len, "%s%s%s", firstChessProgramNames, currentEngine[n], q);
     FREE(firstChessProgramNames); firstChessProgramNames = s; // new list
+    if(*engineListFile) SaveEngineList();
 }
 
 // following implemented as macro to avoid type limitations