news: Check if font color is NULL.

This fixes a crash on opening Settings > Main dialog.

SVN revision: 81649
This commit is contained in:
Igor Murzov 2012-12-22 23:42:17 +00:00 committed by Tom Hacohen
parent 5a6e11c95b
commit aa453d0a96
1 changed files with 4 additions and 2 deletions

View File

@ -157,7 +157,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->viewer.varticles.sort_date = c->viewer.varticles.sort_date;
cfdata->viewer.vcontent.font_size = c->viewer.vcontent.font_size;
cfdata->viewer.vcontent.font_color = E_NEW(E_Color, 1);
sscanf(c->viewer.vcontent.font_color, "#%2x%2x%2x",
sscanf(c->viewer.vcontent.font_color ? : NEWS_VIEWER_VCONTENT_FONT_COLOR_DEFAULT,
"#%2x%2x%2x",
&cfdata->viewer.vcontent.font_color->r,
&cfdata->viewer.vcontent.font_color->g,
&cfdata->viewer.vcontent.font_color->b);
@ -165,7 +166,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
e_color_update_rgb(cfdata->viewer.vcontent.font_color);
cfdata->viewer.vcontent.font_shadow = c->viewer.vcontent.font_shadow;
cfdata->viewer.vcontent.font_shadow_color = E_NEW(E_Color, 1);
sscanf(c->viewer.vcontent.font_shadow_color, "#%2x%2x%2x",
sscanf(c->viewer.vcontent.font_shadow_color ? : NEWS_VIEWER_VCONTENT_FONT_SHADOW_COLOR_DEFAULT,
"#%2x%2x%2x",
&cfdata->viewer.vcontent.font_shadow_color->r,
&cfdata->viewer.vcontent.font_shadow_color->g,
&cfdata->viewer.vcontent.font_shadow_color->b);