# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1271956998 -7200
# Node ID c15cb68e177f4beab1df47a7dfd4d67a807615b6
# Parent  b0957e256d91908622d71554c3436c055feebe5c
Fix Bug#6001.

* xsettings.c (read_and_apply_settings): Check if current_font is
  NULL before strcmp (Bug#6001).

diff -r b0957e256d91 -r c15cb68e177f src/ChangeLog
--- a/src/ChangeLog	Thu Apr 22 09:37:58 2010 -0700
+++ b/src/ChangeLog	Thu Apr 22 19:23:18 2010 +0200
@@ -1,3 +1,8 @@
+2010-04-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsettings.c (read_and_apply_settings): Check if current_font is
+	NULL before strcmp (Bug#6001).
+
 2010-04-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Clean up HP-UX files.
diff -r b0957e256d91 -r c15cb68e177f src/xsettings.c
--- a/src/xsettings.c	Thu Apr 22 09:37:58 2010 -0700
+++ b/src/xsettings.c	Thu Apr 22 19:23:18 2010 +0200
@@ -578,7 +578,7 @@
 
   if (settings.seen & SEEN_FONT)
     {
-      if (strcmp (current_font, settings.font) != 0) 
+      if (!current_font || strcmp (current_font, settings.font) != 0) 
         {
           free (current_font);
           current_font = settings.font;