From efb7cead4752f015d85a830e5e4963b02274e6ca Mon Sep 17 00:00:00 2001 From: Stafford Mitchell Horne Date: Tue, 18 Apr 2006 18:36:11 +0000 Subject: [PATCH] Fix segv in font configuration (thanks tobias) * When the font is originally configured it is set to "". after a restart the font will be read from eet as NULL. I need to check for this. SVN revision: 22203 --- src/bin/e_int_config_fonts.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/e_int_config_fonts.c b/src/bin/e_int_config_fonts.c index 5c94a17b1..43a96443d 100644 --- a/src/bin/e_int_config_fonts.c +++ b/src/bin/e_int_config_fonts.c @@ -144,16 +144,20 @@ _fill_data(E_Config_Dialog_Data *cfdata) if (!strcmp(tc->class_name, efd->text_class)) { - tc->font = evas_stringshare_add(efd->font); - tc->size = efd->size; - tc->enabled = 1; + if (efd->font) + tc->font = evas_stringshare_add(efd->font); + else + tc->font = evas_stringshare_add(""); + + tc->size = efd->size; + tc->enabled = 1; } } if (!tc->enabled) { efd = e_font_default_get(tc->class_name); - if (efd) + if (efd && efd->font) { tc->font = evas_stringshare_add(efd->font); tc->size = efd->size;