forked from enlightenment/enlightenment
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
This commit is contained in:
parent
748c9d3690
commit
efb7cead47
|
@ -144,16 +144,20 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
|
|
||||||
if (!strcmp(tc->class_name, efd->text_class))
|
if (!strcmp(tc->class_name, efd->text_class))
|
||||||
{
|
{
|
||||||
tc->font = evas_stringshare_add(efd->font);
|
if (efd->font)
|
||||||
tc->size = efd->size;
|
tc->font = evas_stringshare_add(efd->font);
|
||||||
tc->enabled = 1;
|
else
|
||||||
|
tc->font = evas_stringshare_add("");
|
||||||
|
|
||||||
|
tc->size = efd->size;
|
||||||
|
tc->enabled = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tc->enabled)
|
if (!tc->enabled)
|
||||||
{
|
{
|
||||||
efd = e_font_default_get(tc->class_name);
|
efd = e_font_default_get(tc->class_name);
|
||||||
if (efd)
|
if (efd && efd->font)
|
||||||
{
|
{
|
||||||
tc->font = evas_stringshare_add(efd->font);
|
tc->font = evas_stringshare_add(efd->font);
|
||||||
tc->size = efd->size;
|
tc->size = efd->size;
|
||||||
|
|
Loading…
Reference in New Issue