(init_defaults): only load the backup font when the

default font fails.

2 files changed, 19 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b7c9fa..5ea77d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-07  Shawn Betts  <sabetts@shitbender.gagrod>
+
+	* src/main.c (init_defaults): only load the backup font when the
+	default font fails.
+
+2007-05-04  Shawn Betts  <sabetts@vcn.bc.ca>
+
+	* src/main.c (init_defaults): if the default font fails, use the
+	backup font.
+
+	* src/conf.h (BACKUP_FONT): new define
+
 2007-04-23  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* src/input.c (update_modifier_map): don't map both super and
diff --git a/src/main.c b/src/main.c
index 9ea60f4..2b272b0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -520,12 +520,14 @@ init_defaults (void)
   /* Attempt to load a font */
   defaults.font = load_query_font_set (dpy, DEFAULT_FONT);
   if (defaults.font == NULL)
-    PRINT_ERROR (("ratpoison: Cannot load font %s.\n", DEFAULT_FONT));
-  defaults.font = load_query_font_set (dpy, BACKUP_FONT);
-  if (defaults.font == NULL)
     {
-      PRINT_ERROR (("ratpoison: Cannot load backup font %s . You lose.\n", BACKUP_FONT));
-      exit (EXIT_FAILURE);
+      PRINT_ERROR (("ratpoison: Cannot load font %s.\n", DEFAULT_FONT));
+      defaults.font = load_query_font_set (dpy, BACKUP_FONT);
+      if (defaults.font == NULL)
+        {
+          PRINT_ERROR (("ratpoison: Cannot load backup font %s . You lose.\n", BACKUP_FONT));
+          exit (EXIT_FAILURE);
+        }
     }
 
   defaults.font_string = xstrdup (DEFAULT_FONT);