aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/seat
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-08 21:18:30 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-08 21:18:30 +1000
commite168e8f0ffbcd3924570aec63655c6ca0ab384fa (patch)
treed2602caa071680a898a80f8096ed8f787103329e /sway/commands/seat
parentRemove unneeded variable (diff)
downloadsway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.tar.gz
sway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.tar.zst
sway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.zip
Don't apply seat config when validating
Diffstat (limited to 'sway/commands/seat')
-rw-r--r--sway/commands/seat/attach.c4
-rw-r--r--sway/commands/seat/fallback.c4
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) {
23 new_attachment->identifier = strdup(argv[0]); 23 new_attachment->identifier = strdup(argv[0]);
24 list_add(new_config->attachments, new_attachment); 24 list_add(new_config->attachments, new_attachment);
25 25
26 apply_seat_config(new_config); 26 if (!config->validating) {
27 apply_seat_config(new_config);
28 }
27 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
28} 30}
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) {
27 "Expected 'fallback <true|false>'"); 27 "Expected 'fallback <true|false>'");
28 } 28 }
29 29
30 apply_seat_config(new_config); 30 if (!config->validating) {
31 apply_seat_config(new_config);
32 }
31 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 33 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
32} 34}