From b2b9146a6fd0ce4cc090448edf84292cc8a2a7b2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 10 Jan 2013 09:39:02 +0000 Subject: [PATCH] backport raster's e_config changes SVN revision: 82539 --- ChangeLog | 5 +++++ NEWS | 1 + src/bin/e_config.c | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d23fd70a6..7c1c462ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ + +2013-01-10 Carsten Haitzler + + * fixed bug where starting with a nonexistent config could cause a crash instead of simply restarting + 2013-01-10 Mike Blumenkrantz * fixed bug where internal dialogs would not redraw after unfullscreening diff --git a/NEWS b/NEWS index 126dbb731..66b3145b2 100644 --- a/NEWS +++ b/NEWS @@ -27,3 +27,4 @@ Fixes: * fixed bug where window border insets were not applied to initial positioning geometry, causing them to be placed incorrectly * Fixed bug with desktop config profile where conf module version variable was misnamed * fixed bug where internal dialogs would not redraw after unfullscreening + * fixed bug where starting with a nonexistent config could cause a crash instead of simply restarting diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 4d670a48d..0d6f2c1e1 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1053,7 +1053,9 @@ e_config_load(void) e_config_profile_set("default"); if (!reload) e_config_profile_del(e_config_profile_get()); e_config_save_block_set(1); - e_sys_action_do(E_SYS_RESTART, NULL); + ecore_app_restart(); + //e_sys_action_do(E_SYS_RESTART, NULL); + return; } if (e_config->config_version < E_CONFIG_FILE_VERSION) {