diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-09 17:45:26 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-09 17:45:26 +0000 |
| commit | 4d17c23224d7d8cf4b7a3da62e4d9e8f977bd443 (patch) | |
| tree | 48c90b141cac750d17d02433390838e330e78264 /main.c | |
| parent | config: add ‘[default].word-delimiters’ (diff) | |
main: configure locale *before* loading the config
Without this, config_load() can’t use wide-character functions
properly.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -352,6 +352,13 @@ main(int argc, char *const *argv) LOG_INFO("arch: %s/%zu-bit, ", name.machine, sizeof(void *) * 8); } + setlocale(LC_CTYPE, ""); + LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL)); + if (!locale_is_utf8()) { + LOG_ERR("locale is not UTF-8"); + return ret; + } + struct config conf = {NULL}; if (!config_load(&conf, conf_path, &user_notifications, check_config)) { config_free(conf); @@ -365,13 +372,6 @@ main(int argc, char *const *argv) fcft_set_scaling_filter(conf.tweak.fcft_filter); - setlocale(LC_CTYPE, ""); - LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL)); - if (!locale_is_utf8()) { - LOG_ERR("locale is not UTF-8"); - return ret; - } - if (conf_term != NULL) { free(conf.term); conf.term = xstrdup(conf_term); |
