discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=cafc28a197da80e015b5573403d5ca1c6382e827

commit cafc28a197da80e015b5573403d5ca1c6382e827
Author: Mike Blumenkrantz <[email protected]>
Date:   Fri Nov 29 09:47:31 2013 -0500

    improve theme apply to actually apply startup splash setting...
---
 src/modules/conf_theme/e_int_config_theme.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/modules/conf_theme/e_int_config_theme.c 
b/src/modules/conf_theme/e_int_config_theme.c
index 1caa603..dcaf771 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -745,22 +745,21 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, 
E_Config_Dialog_Data *cfdata)
 
    file = ecore_file_file_get(cfdata->theme);
    name = ecore_file_strip_ext(file);
+   e_config->show_splash = cfdata->show_splash;
    if (name)
      {
         const char *theme = elm_theme_get(NULL);
 
-        if ((theme) && (!strcmp(name, theme)))
+        if (e_util_strcmp(name, theme))
           {
+             elm_theme_set(NULL, name);
+             elm_config_all_flush();
+             elm_config_save();
              free(name);
-             return 1;
+             a = e_action_find("restart");
+             if ((a) && (a->func.go)) a->func.go(NULL, NULL);
           }
-        elm_theme_set(NULL, name);
-        elm_config_all_flush();
-        elm_config_save();
         free(name);
-        a = e_action_find("restart");
-        if ((a) && (a->func.go)) a->func.go(NULL, NULL);
      }
-   e_config->show_splash = cfdata->show_splash;
    return 1; /* Apply was OK */
 }

-- 


Reply via email to