diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-11-05 21:15:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-05 21:15:56 +0100 |
commit | fbf1730557687964ca520e70d94ab4b0fd63a595 (patch) | |
tree | f535ef37f38ea475e7e63b0a237f30804317aa06 | |
parent | Merge pull request #3071 from RedSoxFan/fix-3064 (diff) | |
parent | config: mention that reload message is also printed on validation (diff) | |
download | sway-fbf1730557687964ca520e70d94ab4b0fd63a595.tar.gz sway-fbf1730557687964ca520e70d94ab4b0fd63a595.tar.zst sway-fbf1730557687964ca520e70d94ab4b0fd63a595.zip |
Merge pull request #3078 from Emantor/fix/exec_always_double_load
Fix the double execution of exec_always commands on config reloads
-rw-r--r-- | sway/commands/exec_always.c | 2 | ||||
-rw-r--r-- | sway/config.c | 3 |
2 files changed, 3 insertions, 2 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 | ||
16 | struct cmd_results *cmd_exec_always(int argc, char **argv) { | 16 | struct 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 | } |
diff --git a/sway/config.c b/sway/config.c index 9ec40367..7ef3ef38 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -389,7 +389,8 @@ bool load_main_config(const char *file, bool is_active, bool validating) { | |||
389 | config_defaults(config); | 389 | config_defaults(config); |
390 | config->validating = validating; | 390 | config->validating = validating; |
391 | if (is_active) { | 391 | if (is_active) { |
392 | wlr_log(WLR_DEBUG, "Performing configuration file reload"); | 392 | wlr_log(WLR_DEBUG, "Performing configuration file %s", |
393 | validating ? "validation" : "reload"); | ||
393 | config->reloading = true; | 394 | config->reloading = true; |
394 | config->active = true; | 395 | config->active = true; |
395 | 396 | ||