X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=40e41c80ae1837043d7f79bfc1667f5a8aabfb3a;hb=0e604fd62231e9375a446a4891efa1ede735f4d2;hp=d8fcbaac650520fb4d43c8f1ea380f49b796ae5e;hpb=465713a168ea9070579738f9e4313f876da74875;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index d8fcbaa..40e41c8 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -447,7 +447,7 @@ CreateFonts ()
 void
 ParseColor (int n, char *name)
 { // in XBoard, just copy the color-name string
-  if(colorVariable[n]) *(char**)colorVariable[n] = strdup(name);
+  if(colorVariable[n] && *name == '#') *(char**)colorVariable[n] = strdup(name);
 }
 
 char *
@@ -1182,7 +1182,7 @@ main (int argc, char **argv)
 	marginH =  h - a.height - hc; // subtract current clock height, so it can be added back dynamically
     }
 
-    CreateAnyPieces();
+    CreateAnyPieces(1);
     CreateGrid();
 
     if(appData.logoSize)
@@ -2228,13 +2228,20 @@ static void
 LoadLogo (ChessProgramState *cps, int n, Boolean ics)
 {
     char buf[MSG_SIZ], *logoName = buf;
+    FILE *f;
     if(appData.logo[n][0]) {
 	logoName = appData.logo[n];
     } else if(appData.autoLogo) {
 	if(ics) { // [HGM] logo: in ICS mode second can be used for ICS
 	    sprintf(buf, "%s/%s.png", appData.logoDir, appData.icsHost);
-	} else if(appData.directory[n] && appData.directory[n][0]) {
-	    sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy);
+	} else { // engine; look in engine-dir (if any) first
+	    snprintf(buf, MSG_SIZ, "%s/logo.png", appData.directory[n]);
+	    if(appData.directory[n] && appData.directory[n][0]
+	       && strcmp(appData.directory[n], ".") && (f = fopen(buf, "r")) )
+		fclose(f);
+	    else // no engine dir or no logo.png in it: look in logo dir
+	    if(appData.logoDir && appData.logoDir[0])
+		sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy);
 	}
     }
     if(logoName[0])