Fix up previous commit.
authorAndrej Kacian <ticho@claws-mail.org>
Tue, 19 Jul 2016 09:48:17 +0000 (11:48 +0200)
committerAndrej Kacian <ticho@claws-mail.org>
Tue, 19 Jul 2016 09:48:17 +0000 (11:48 +0200)
Move the update_fonts check earlier, before the last_*font
pointers get modified.

src/folderview.c

index 8f66b16..909b2ad 100644 (file)
@@ -2684,6 +2684,9 @@ void folderview_reflect_prefs(void)
                        last_derive != prefs_common.derive_from_normal_font)
                update_font = TRUE;
 
+       if (!update_font)
+               return;
+
        g_free(last_smallfont);
        last_smallfont = g_strdup(SMALL_FONT);
        g_free(last_normalfont);
@@ -2692,9 +2695,6 @@ void folderview_reflect_prefs(void)
        last_boldfont = g_strdup(BOLD_FONT);
        last_derive = prefs_common.derive_from_normal_font;
 
-       if (!update_font)
-               return;
-
        normal_style = normal_color_style = bold_style =
                bold_color_style = bold_tgtfold_style = NULL;