Also update engine list when saving engine settings

[xboard.git] / args.h

diff --git a/args.h b/args.h
index 1da2448..cdf51aa 100644 (file)
--- a/args.h
+++ b/args.h
@@ -113,6 +113,7 @@ char *secondEngineLine;
 char *icsNick;
 char *theme;
 char *replace;
+char *engineListFile;
 
 void EnsureOnScreen(int *x, int *y, int minX, int minY);
 char StringGet(void *getClosure);
@@ -518,6 +519,7 @@ ArgDescriptor argDescriptors[] = {
   { "secondChessProgramNames", ArgString, (void *) &secondChessProgramNames,
     !XBOARD, (ArgIniType) SCP_NAMES },
   { "themeNames", ArgString, (void *) &appData.themeNames, TRUE, (ArgIniType) "native -upf false -ub false -ubt false -pid \"\"\n" },
+  { "engineList", ArgFilename, (void *) &engineListFile, TRUE, (ArgIniType) "" },
   { "addMasterOption", ArgMaster, NULL, FALSE, INVALID },
   { "installEngine", ArgInstall, (void *) &firstChessProgramNames, FALSE, (ArgIniType) "" },
   { "installTheme", ArgInstall, (void *) &appData.themeNames, FALSE, (ArgIniType) "" },
@@ -1186,9 +1188,9 @@ ParseArgs(GetFunc get, void *cl)
         break;
       }
       if(replace) { // previous -replace option makes this string option conditional
-       char *p = (char*) replace;
+       int differs = strcmp(*(char**) ad->argLoc, (char*) replace);
        free(replace); replace = NULL; // but expires in the process
-        if(strcmp(*(char**) ad->argLoc, p)) break; // only use to replace the given string
+        if(differs) break; // only use to replace the given string
       }
       ASSIGN(*(char **) ad->argLoc, argValue);
       break;
@@ -1436,6 +1438,9 @@ InitAppData(char *lpCmdLine)
   /* Parse command line */
   ParseArgs(StringGet, &lpCmdLine);
 
+  /* if separate engine list is used, parse that too */
+  if(*engineListFile) ParseSettingsFile(engineListFile, &engineListFile);
+
   if(appData.viewer && appData.viewerOptions[0]) ParseArgsFromString(appData.viewerOptions);
   if(appData.tourney && appData.tourneyOptions[0]) ParseArgsFromString(appData.tourneyOptions);
   chessProgram |= GetEngineLine(firstEngineLine, 0) || GetEngineLine(secondEngineLine, 1);