aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/output.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/commands/output.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/commands/output.c')
-rw-r--r--sway/commands/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 2790bd63..013f17b2 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -103,7 +103,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
103 // If reloading, the output configs will be applied after reading the 103 // If reloading, the output configs will be applied after reading the
104 // entire config and before the deferred commands so that an auto generated 104 // entire config and before the deferred commands so that an auto generated
105 // workspace name is not given to re-enabled outputs. 105 // workspace name is not given to re-enabled outputs.
106 if (!config->reloading) { 106 if (!config->reloading && !config->validating) {
107 apply_output_config_to_outputs(output); 107 apply_output_config_to_outputs(output);
108 if (background) { 108 if (background) {
109 spawn_swaybg(); 109 spawn_swaybg();