summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_config.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-08-23 13:37:55 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-08-23 13:38:33 -0400
commit42d10b84be939fe86404e0526d98946b73a3f2e9 (patch)
tree35393410e76e1e764bba0163af1a54479b293af7 /src/lib/elementary/elm_config.c
parent2cd4d67109bc522984690270b1a3d1dfebb1aea0 (diff)
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
Diffstat (limited to 'src/lib/elementary/elm_config.c')
-rw-r--r--src/lib/elementary/elm_config.c5
1 files 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)
1477 Eet_File *ef = NULL; 1477 Eet_File *ef = NULL;
1478 int len = 0, i; 1478 int len = 0, i;
1479 1479
1480 if (_use_build_config) goto end;
1480 // if env var - use profile without question 1481 // if env var - use profile without question
1481 s = _getenv_once("ELM_PROFILE"); 1482 s = _getenv_once("ELM_PROFILE");
1482 if (s) 1483 if (s)
@@ -1497,7 +1498,7 @@ _profile_fetch_from_conf(void)
1497 } 1498 }
1498 } 1499 }
1499 1500
1500 for (i = 0; i < 2 && !_use_build_config; i++) 1501 for (i = 0; i < 2; i++)
1501 { 1502 {
1502 // user profile 1503 // user profile
1503 if (i == 0) 1504 if (i == 0)
@@ -1527,7 +1528,7 @@ _profile_fetch_from_conf(void)
1527 eet_close(ef); 1528 eet_close(ef);
1528 } 1529 }
1529 } 1530 }
1530 1531end:
1531 _elm_profile = strdup("default"); 1532 _elm_profile = strdup("default");
1532} 1533}
1533 1534