summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsabetts <sabetts>2007-05-07 18:37:54 +0000
committersabetts <sabetts>2007-05-07 18:37:54 +0000
commita42464993f766c4463c8aae27e60b566002fb67c (patch)
tree64c647d0c63eb0fe19d568eb1a4ccb0ea831167f /src
parentbee55fb437fb4be1ba9505f7a49bd75578f5afa3 (diff)
downloadratpoison-a42464993f766c4463c8aae27e60b566002fb67c.zip
(init_defaults): only load the backup font when the
default font fails.
Diffstat (limited to 'src')
-rw-r--r--src/main.c12
1 files changed, 7 insertions, 5 deletions
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);