From 45869513bfebba80cc2ab42e4218f68b34b1e6ac Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 1 Nov 2020 01:09:51 +0100 Subject: Embracing branches --- htop.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'htop.c') diff --git a/htop.c b/htop.c index 76754462..7fbc04c9 100644 --- a/htop.c +++ b/htop.c @@ -243,12 +243,13 @@ static void setCommFilter(State* state, char** commFilter) { int main(int argc, char** argv) { char* lc_ctype = getenv("LC_CTYPE"); - if (lc_ctype != NULL) + if (lc_ctype != NULL) { setlocale(LC_CTYPE, lc_ctype); - else if ((lc_ctype = getenv("LC_ALL"))) + } else if ((lc_ctype = getenv("LC_ALL"))) { setlocale(LC_CTYPE, lc_ctype); - else + } else { setlocale(LC_CTYPE, ""); + } CommandLineSettings flags = parseArguments(argc, argv); // may exit() @@ -271,14 +272,18 @@ int main(int argc, char** argv) { Header_populateFromSettings(header); - if (flags.delay != -1) + if (flags.delay != -1) { settings->delay = flags.delay; - if (!flags.useColors) + } + if (!flags.useColors) { settings->colorScheme = COLORSCHEME_MONOCHROME; - if (!flags.enableMouse) + } + if (!flags.enableMouse) { settings->enableMouse = false; - if (flags.treeView) + } + if (flags.treeView) { settings->treeView = true; + } CRT_init(settings->delay, settings->colorScheme, flags.allowUnicode); -- cgit v1.2.3