sway

commit fbf1730557687964ca520e70d94ab4b0fd63a595
parent e9c77970fa23a7eda88fc0dde684961e3caca5e9
Author: Drew DeVault <sir@cmpwn.com>
Date:   Mon,  5 Nov 2018 21:15:56 +0100

Merge pull request #3078 from Emantor/fix/exec_always_double_load

Fix the double execution of exec_always commands on config reloads
Diffstat:
M
sway/commands/exec_always.c
 | 
2
+-
M
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
@@ -15,7 +15,7 @@
 
 struct cmd_results *cmd_exec_always(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
+	if (!config->active || config->validating) return cmd_results_new(CMD_DEFER, NULL, NULL);
 	if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
diff --git a/sway/config.c b/sway/config.c
@@ -389,7 +389,8 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
 	config_defaults(config);
 	config->validating = validating;
 	if (is_active) {
-		wlr_log(WLR_DEBUG, "Performing configuration file reload");
+		wlr_log(WLR_DEBUG, "Performing configuration file %s",
+			validating ? "validation" : "reload");
 		config->reloading = true;
 		config->active = true;