enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

prune module config list when loading a module 

it's somehow possible to get multiple instances of a module in the config.
since I don't know whether this is a current or past problem, prune the list
on every module load to remove subsequent instances of the module

fix T2181
This commit is contained in:
Mike Blumenkrantz 2015-04-30 14:39:28 -04:00
parent 6530a73db8
commit f28eec002a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_module.c
View File

@ -298,7 +298,7 @@ e_module_new(const char *name)
char body[4096], title[1024];
const char *modpath = NULL;
char *s;
Eina_List *l;
Eina_List *l, *ll;
E_Config_Module *em;
int in_list = 0;
@ -427,13 +427,20 @@ init_done:
}
}
}
EINA_LIST_FOREACH(e_config->modules, l, em)
EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em)
{
if (!em) continue;
if (em->name == m->name)
{
in_list = 1;
break;
if (in_list)
{
/* duplicate module config */
e_config->modules = eina_list_remove_list(e_config->modules, l);
eina_stringshare_del(em->name);
free(em);
}
else
in_list = 1;
}
}
if (!in_list)