styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle better a startup where a config cannot be loaded 

ticket #2003


SVN revision: 81163
This commit is contained in:
Mike Blumenkrantz 2012-12-17 16:12:32 +00:00
parent 46f630f103
commit f0965845b5
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/e_config.c
View File

@ -1068,6 +1068,15 @@ e_config_load(void)
} }
} }
if (!e_config) if (!e_config)
{
E_Action *a;
e_config_profile_set("default");
e_config_profile_del(e_config_profile_get());
e_config_save_block_set(1);
a = e_action_find("restart");
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
else
{ {
ERR("EEEK! no config of any sort! abort abort abort!"); ERR("EEEK! no config of any sort! abort abort abort!");
e_error_message_show("Enlightenment was started without any configuration\n" e_error_message_show("Enlightenment was started without any configuration\n"
@ -1079,6 +1088,7 @@ e_config_load(void)
"for the profile you are using before proceeeding."); "for the profile you are using before proceeeding.");
abort(); abort();
} }
}
if (e_config->config_version < E_CONFIG_FILE_VERSION) if (e_config->config_version < E_CONFIG_FILE_VERSION)
{ {
/* we need an upgrade of some sort */ /* we need an upgrade of some sort */