X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=args.h;h=f52404fac90878c5588c342a46c6fbcdd700215b;hb=faf7933d96193d30d052f2e75a0271c4309d965b;hp=48cb3d74e3e2d2836a2cfcfd8c30bba939086edd;hpb=95bcf4c69c5c7c40bcecdf5624ca622a9373701e;p=xboard.git

diff --git a/args.h b/args.h
index 48cb3d7..f52404f 100644
--- a/args.h
+++ b/args.h
@@ -913,11 +913,16 @@ ParseSettingsFile(char *name, char **addr)
   if (ok) {
     f = fopen(fullname, "r");
 #ifdef DATADIR
-    if(f == NULL && *fullname != '/') {         // when a relative name did not work
+    if(f == NULL && *fullname != '/' && !addr) {         // when a relative name did not work
 	char buf[MSG_SIZ];
-	snprintf(buf, MSG_SIZ, "%s/themes/conf", DATADIR);
-	MySearchPath(buf, name, fullname); // also look in standard place
+	snprintf(buf, MSG_SIZ, "~/.xboard/themes/conf/%s", name);
+	MySearchPath(installDir, buf, fullname); // first look in user's own files
 	f = fopen(fullname, "r");
+	if(f == NULL) {
+	    snprintf(buf, MSG_SIZ, "%s/themes/conf", DATADIR);
+	    MySearchPath(buf, name, fullname); // also look in standard place
+	    f = fopen(fullname, "r");
+	}
     }
 #endif
     if (f != NULL) {
@@ -1395,6 +1400,8 @@ InitAppData(char *lpCmdLine)
      appData.NrRanks > BOARD_RANKS   )
       DisplayFatalError("Recompile with BOARD_RANKS or BOARD_FILES, to support this size", 0, 2);
 
+  if(!*appData.secondChessProgram) { ASSIGN(appData.secondChessProgram, appData.firstChessProgram); } // [HGM] scp defaults to fcp
+
   /* [HGM] After parsing the options from the .ini file, and overruling them
    * with options from the command line, we now make an even higher priority
    * overrule by WB options attached to the engine command line. This so that