forked from enlightenment/efl
elm theme - handle error cases and eina file handles properly
@fix
This commit is contained in:
parent
bc90cbfdff
commit
fa40e25a02
|
@ -60,7 +60,11 @@ _elm_theme_item_finalize(Eina_Inlist **files,
|
||||||
char *version;
|
char *version;
|
||||||
int v;
|
int v;
|
||||||
|
|
||||||
if (!(version = edje_mmap_data_get(f, "version"))) return;
|
if (!(version = edje_mmap_data_get(f, "version")))
|
||||||
|
{
|
||||||
|
eina_file_close(f);
|
||||||
|
return;
|
||||||
|
}
|
||||||
v = atoi(version);
|
v = atoi(version);
|
||||||
if (v < 110) // bump this version number when we need to
|
if (v < 110) // bump this version number when we need to
|
||||||
{
|
{
|
||||||
|
@ -702,11 +706,12 @@ elm_theme_extension_del(Elm_Theme *th, const char *item)
|
||||||
EAPI void
|
EAPI void
|
||||||
elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_File *f)
|
elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_File *f)
|
||||||
{
|
{
|
||||||
Eina_File *file = eina_file_dup(f);
|
Eina_File *file;
|
||||||
|
|
||||||
if (!f) return;
|
if (!f) return;
|
||||||
if (!th) th = theme_default;
|
if (!th) th = theme_default;
|
||||||
if (!th) return;
|
if (!th) return;
|
||||||
|
file = eina_file_dup(f);
|
||||||
th->extension_items = eina_list_free(th->extension_items);
|
th->extension_items = eina_list_free(th->extension_items);
|
||||||
_elm_theme_item_finalize(&th->extension, eina_file_filename_get(file), file, EINA_FALSE, EINA_FALSE);
|
_elm_theme_item_finalize(&th->extension, eina_file_filename_get(file), file, EINA_FALSE, EINA_FALSE);
|
||||||
elm_theme_flush(th);
|
elm_theme_flush(th);
|
||||||
|
|
Loading…
Reference in New Issue