diff options
| author | emersion <contact@emersion.fr> | 2019-01-09 10:01:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 10:01:17 +0100 |
| commit | d06782c5e71fb1a6229c1add16bae0dbf919c5c1 (patch) | |
| tree | 7a6af7be87d049433b56ea3d0f12e1b1c11611be | |
| parent | 8daea2bfec4a92babe4ffa89eb28c8f9ba92cf84 (diff) | |
| parent | f33969358c77ea440677a97b4f9a5fb2013ca5ea (diff) | |
| download | sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.tar.xz | |
Merge pull request #3386 from RedSoxFan/seat-reload-wait
reload: apply seat cfgs after reading entire cfg
| -rw-r--r-- | sway/commands/seat.c | 4 | ||||
| -rw-r--r-- | sway/config.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands/seat.c b/sway/commands/seat.c index 3e7ffed9..b8db862b 100644 --- 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 index 8a0b293c..dfbe4cb9 100644 --- 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) { |