summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-04-10 11:05:56 +0900
committerChris Michael <cp.michael@samsung.com>2017-04-11 11:51:49 -0400
commit3f6b27c4d64f33601a249e48f9496ff4aeda181c (patch)
treeb47c37abb6f7450c3432d70d77842033abb8e93d
parentecf26e0ed8f07b18516360087b86ded028d34b1e (diff)
elm config - reload at runtime - fix env var overrides being lost
if you set config via environment variables then sa config update/reload may end up overriding these again whenever it is updated and thus may result in scaling or other things suddely changing @fix
-rw-r--r--src/lib/elementary/elm_config.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 3510ba12f5..582eb3e969 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1671,6 +1671,7 @@ _config_load(void)
1671 { 1671 {
1672 if (_elm_config->config_version < ELM_CONFIG_VERSION) 1672 if (_elm_config->config_version < ELM_CONFIG_VERSION)
1673 _config_update(); 1673 _config_update();
1674 _env_get();
1674 return; 1675 return;
1675 } 1676 }
1676 } 1677 }
@@ -1679,7 +1680,11 @@ _config_load(void)
1679 * this one, if it's not the right one, someone screwed up at the time 1680 * this one, if it's not the right one, someone screwed up at the time
1680 * of installing it */ 1681 * of installing it */
1681 _elm_config = _config_system_load(); 1682 _elm_config = _config_system_load();
1682 if (_elm_config) return; 1683 if (_elm_config)
1684 {
1685 _env_get();
1686 return;
1687 }
1683 /* FIXME: config load could have failed because of a non-existent 1688 /* FIXME: config load could have failed because of a non-existent
1684 * profile. Fallback to default before moving on */ 1689 * profile. Fallback to default before moving on */
1685 1690
@@ -1810,6 +1815,7 @@ _config_load(void)
1810 _elm_config->icon_theme = eina_stringshare_add(ELM_CONFIG_ICON_THEME_ELEMENTARY); 1815 _elm_config->icon_theme = eina_stringshare_add(ELM_CONFIG_ICON_THEME_ELEMENTARY);
1811 _elm_config->popup_scrollable = EINA_FALSE; 1816 _elm_config->popup_scrollable = EINA_FALSE;
1812 _elm_config->entry_select_allow = EINA_TRUE; 1817 _elm_config->entry_select_allow = EINA_TRUE;
1818 _env_get();
1813} 1819}
1814 1820
1815static void 1821static void