aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 21:18:30 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 21:18:30 +1000
commite168e8f0ffbcd3924570aec63655c6ca0ab384fa (patch)
treed2602caa071680a898a80f8096ed8f787103329e
parent88a5e26c6eeb28cf934401d377654236fdf8cdfd (diff)
downloadsway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.zip
sway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.tar.gz
sway-e168e8f0ffbcd3924570aec63655c6ca0ab384fa.tar.bz2
Don't apply seat config when validating
-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 3e771c0..6b4bcf1 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 56feaab..11f5a08 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);
}