diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-10-08 12:05:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 12:05:18 +0000 |
| commit | b3b17280de54021657eabf2df4c3dbfd0039bac8 (patch) | |
| tree | d2602caa071680a898a80f8096ed8f787103329e /sway/commands/seat | |
| parent | 89f4ebef064809c4e3d4cc08f8c7f08f4bc6d420 (diff) | |
| parent | e168e8f0ffbcd3924570aec63655c6ca0ab384fa (diff) | |
| download | sway-b3b17280de54021657eabf2df4c3dbfd0039bac8.tar.xz | |
Merge pull request #2789 from RyanDwyer/reload-idle
Reload config using idle event
Diffstat (limited to 'sway/commands/seat')
| -rw-r--r-- | sway/commands/seat/attach.c | 4 | ||||
| -rw-r--r-- | sway/commands/seat/fallback.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c index 3e771c00..6b4bcf1f 100644 --- a/sway/commands/seat/attach.c +++ b/sway/commands/seat/attach.c @@ -23,6 +23,8 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) { new_attachment->identifier = strdup(argv[0]); list_add(new_config->attachments, new_attachment); - apply_seat_config(new_config); + if (!config->validating) { + apply_seat_config(new_config); + } return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c index 56feaab5..11f5a08c 100644 --- a/sway/commands/seat/fallback.c +++ b/sway/commands/seat/fallback.c @@ -27,6 +27,8 @@ struct cmd_results *seat_cmd_fallback(int argc, char **argv) { "Expected 'fallback <true|false>'"); } - apply_seat_config(new_config); + if (!config->validating) { + apply_seat_config(new_config); + } return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |