Repair damage done by merging with v4.7.x

[xboard.git] / xaw / xboard.c

diff --git a/xaw/xboard.c b/xaw/xboard.c
index f1d9747..bed61e5 100644 (file)
--- a/xaw/xboard.c
+++ b/xaw/xboard.c
@@ -204,7 +204,6 @@ extern char *getenv();
 #include "draw.h"
 
 #define SLASH '/'
-#define DATADIR "~~"
 
 #ifdef __EMX__
 #ifndef HAVE_USLEEP
@@ -536,7 +535,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 *
@@ -1288,7 +1287,7 @@ main (int argc, char **argv)
 
     CatchDeleteWindow(shellWidget, "QuitProc");
 
-    CreateAnyPieces();
+    CreateAnyPieces(1);
     CreateGrid();
 
     if(appData.logoSize)
@@ -2502,7 +2501,7 @@ LoadLogo (ChessProgramState *cps, int n, Boolean ics)
     } 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]) {
+       } else if(appData.logoDir && appData.logoDir[0]) {
            sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy);
        }
     }