Fixed style_init() related errors

[rodin/chimara.git] / libchimara / style.c

diff --git a/libchimara/style.c b/libchimara/style.c
index 034dfd52f22c49a004da09758e54f26da2b5b89f..e4169d6a6aa5ade98c58a7ec43dc04e8057c7eed 100644 (file)
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -826,12 +826,16 @@ get_current_font(guint32 wintype)
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        GtkTextTag *normal;
 
+       if( G_UNLIKELY(!glk_data->style_initialized) ) {
+               style_init();
+       }
+
        switch(wintype) {
        case wintype_TextGrid:
-               normal = g_hash_table_lookup(glk_data->default_styles->text_grid, "normal");
+               normal = g_hash_table_lookup(glk_data->current_styles->text_grid, "normal");
                break;
        case wintype_TextBuffer:
-               normal = g_hash_table_lookup(glk_data->default_styles->text_buffer, "normal");
+               normal = g_hash_table_lookup(glk_data->current_styles->text_buffer, "normal");
                break;
        default:
                return NULL;