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 /sway/commands/seat.c | |
| parent | Merge pull request #3390 from RedSoxFan/execute-seat (diff) | |
| parent | reload: apply seat cfgs after reading entire cfg (diff) | |
| download | sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.tar.gz sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.tar.zst sway-d06782c5e71fb1a6229c1add16bae0dbf919c5c1.zip | |
Merge pull request #3386 from RedSoxFan/seat-reload-wait
reload: apply seat cfgs after reading entire cfg
Diffstat (limited to 'sway/commands/seat.c')
| -rw-r--r-- | sway/commands/seat.c | 4 |
1 files changed, 3 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) { | |||
| 35 | 35 | ||
| 36 | struct seat_config *sc = | 36 | struct seat_config *sc = |
| 37 | store_seat_config(config->handler_context.seat_config); | 37 | store_seat_config(config->handler_context.seat_config); |
| 38 | input_manager_apply_seat_config(sc); | 38 | if (!config->reading) { |
| 39 | input_manager_apply_seat_config(sc); | ||
| 40 | } | ||
| 39 | 41 | ||
| 40 | config->handler_context.seat_config = NULL; | 42 | config->handler_context.seat_config = NULL; |
| 41 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 43 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |