sway

commit d06782c5e71fb1a6229c1add16bae0dbf919c5c1
parent 8daea2bfec4a92babe4ffa89eb28c8f9ba92cf84
Author: emersion <contact@emersion.fr>
Date:   Wed,  9 Jan 2019 10:01:17 +0100

Merge pull request #3386 from RedSoxFan/seat-reload-wait

reload: apply seat cfgs after reading entire cfg
Diffstat:
M
sway/commands/seat.c
 | 
4
+++-
M
sway/config.c
 | 
4
++++

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
@@ -35,7 +35,9 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
 
 	struct seat_config *sc =
 		store_seat_config(config->handler_context.seat_config);
-	input_manager_apply_seat_config(sc);
+	if (!config->reading) {
+		input_manager_apply_seat_config(sc);
+	}
 
 	config->handler_context.seat_config = NULL;
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/config.c b/sway/config.c
@@ -463,7 +463,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
 		if (config->swaynag_config_errors.pid > 0) {
 			swaynag_show(&config->swaynag_config_errors);
 		}
+
 		input_manager_verify_fallback_seat();
+		for (int i = 0; i < config->seat_configs->length; i++) {
+			input_manager_apply_seat_config(config->seat_configs->items[i]);
+		}
 	}
 
 	if (old_config) {