Ignore color arguments not starting with #

Old settings files from xpm-using version might still contain color
designations like 'white' or 'red'. Since Cairo would interpret these
as black, it is better to ignore them, so the default color is used.

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 895e10f..4daec27 100644 (file)
--- 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 *

diff --git a/xaw/xboard.c b/xaw/xboard.c
index 86d4283..b9fb0e1 100644 (file)
--- a/xaw/xboard.c
+++ b/xaw/xboard.c
@@ -536,7 +536,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 *