From d559beca4fc4539089cca398aaf7f7c738eab585 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Mon, 23 Dec 2013 14:49:50 +0900 Subject: [PATCH] theme: Check the return value of _elm_theme_group_file_find() and do not pass NULL to eina_file_filename_get(). eina_file_filename_get() spits unnecessary eina error when the parameter is null. In this case, we need to check the return of _elm_theme_group_file_find() and do not call eina_file_filename_get() when the return is null. One should check the return of elm_theme_group_path_find(). Thank zmike for pointing this out. --- legacy/elementary/src/lib/elm_theme.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/src/lib/elm_theme.c b/legacy/elementary/src/lib/elm_theme.c index 7dea91e..914849d 100644 --- a/legacy/elementary/src/lib/elm_theme.c +++ b/legacy/elementary/src/lib/elm_theme.c @@ -856,8 +856,13 @@ EAPI const char * elm_theme_group_path_find(Elm_Theme *th, const char *group) { EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL); + Eina_File *th_file = NULL; if (!th) th = &(theme_default); - return eina_file_filename_get(_elm_theme_group_file_find(th, group)); + + th_file = _elm_theme_group_file_find(th, group); + if (th_file) + return eina_file_filename_get(th_file); + return NULL; } static Eina_List * -- 2.7.4