aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2020-02-10 21:25:07 -0500
committerLibravatar Simon Ser <contact@emersion.fr>2020-02-11 16:02:11 +0100
commit33a984bbc5c5ec4202f24bacf6ddd584b95a9ec0 (patch)
tree1f1f14d6aede50cf2abcaf9fe4baa7c7190ee34d /sway/config.c
parentFix ordering of setgid and setuid (diff)
downloadsway-33a984bbc5c5ec4202f24bacf6ddd584b95a9ec0.tar.gz
sway-33a984bbc5c5ec4202f24bacf6ddd584b95a9ec0.tar.zst
sway-33a984bbc5c5ec4202f24bacf6ddd584b95a9ec0.zip
config: fix validation exit code and log level
This makes it so invalid configs will return the exit code 1 when the validation flag is given. This also reduces the log level to SWAY_ERROR, which makes it so only the errors are shown. If someone wants more verbose output, the can use the -V/--verbose or -d/--debug flags. Additionally, this also makes it so swaybg will not be spawned when validating the config.
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c
index 6d730f46..c20625cf 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -404,7 +404,7 @@ static bool load_config(const char *path, struct sway_config *config,
404 sway_log(SWAY_ERROR, "Error(s) loading config!"); 404 sway_log(SWAY_ERROR, "Error(s) loading config!");
405 } 405 }
406 406
407 return true; 407 return config->active || !config->validating || config_load_success;
408} 408}
409 409
410bool load_main_config(const char *file, bool is_active, bool validating) { 410bool load_main_config(const char *file, bool is_active, bool validating) {