aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/exec_always.c
diff options
context:
space:
mode:
authorLibravatar Rouven Czerwinski <rouven@czerwinskis.de>2018-11-05 20:28:59 +0100
committerLibravatar Rouven Czerwinski <rouven@czerwinskis.de>2018-11-05 20:32:45 +0100
commit5fdffea99ac5fcfd3618256a0291c9ff71cb1480 (patch)
tree7c67258b505b3d23e2585639362fd5d13a00bf29 /sway/commands/exec_always.c
parentMerge pull request #3071 from RedSoxFan/fix-3064 (diff)
downloadsway-5fdffea99ac5fcfd3618256a0291c9ff71cb1480.tar.gz
sway-5fdffea99ac5fcfd3618256a0291c9ff71cb1480.tar.zst
sway-5fdffea99ac5fcfd3618256a0291c9ff71cb1480.zip
commands/exec_always: defer command on config validation
The exec_always command was executed twice, since it was not checking for the config->validating variable. Fix this by defering the command if the configuration is validating. Fixes #3072
Diffstat (limited to 'sway/commands/exec_always.c')
-rw-r--r--sway/commands/exec_always.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 8bdeceeb..7a15709b 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -15,7 +15,7 @@
15 15
16struct cmd_results *cmd_exec_always(int argc, char **argv) { 16struct cmd_results *cmd_exec_always(int argc, char **argv) {
17 struct cmd_results *error = NULL; 17 struct cmd_results *error = NULL;
18 if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); 18 if (!config->active || config->validating) return cmd_results_new(CMD_DEFER, NULL, NULL);
19 if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { 19 if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
20 return error; 20 return error;
21 } 21 }