From 42d10b84be939fe86404e0526d98946b73a3f2e9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 23 Aug 2019 13:37:55 -0400 Subject: [PATCH] elm/config: always use default profile with EFL_RUN_IN_TREE Summary: if this env var is set, we're probably running unit tests or something and we should ignore ELM_PROFILE Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9701 --- src/lib/elementary/elm_config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 5624f0b125..484728627b 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -1477,6 +1477,7 @@ _profile_fetch_from_conf(void) Eet_File *ef = NULL; int len = 0, i; + if (_use_build_config) goto end; // if env var - use profile without question s = _getenv_once("ELM_PROFILE"); if (s) @@ -1497,7 +1498,7 @@ _profile_fetch_from_conf(void) } } - for (i = 0; i < 2 && !_use_build_config; i++) + for (i = 0; i < 2; i++) { // user profile if (i == 0) @@ -1527,7 +1528,7 @@ _profile_fetch_from_conf(void) eet_close(ef); } } - +end: _elm_profile = strdup("default"); }