aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/seat/attach.c
diff options
context:
space:
mode:
authorLibravatar Bill Doyle <vil@vil.lv>2021-05-31 19:47:10 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2021-06-03 14:07:18 +0200
commitcad6e59b932e082d4e9c4d13b4210df9e4ac7cf3 (patch)
tree1a7e9ef4ec6770ba9387b94fdac51b4543cb32fe /sway/commands/seat/attach.c
parentIterate over subsurfaces below the parent surface (diff)
downloadsway-cad6e59b932e082d4e9c4d13b4210df9e4ac7cf3.tar.gz
sway-cad6e59b932e082d4e9c4d13b4210df9e4ac7cf3.tar.zst
sway-cad6e59b932e082d4e9c4d13b4210df9e4ac7cf3.zip
Only defer seat attachment during initial startup
Deferred commands are only run once, during sway startup. This means that deferring seat attachment based on whether we are reading the config prevents devices from being reattached to the correct seat during a config reload. Instead, only defer if the config is not yet active. Fixes #6048.
Diffstat (limited to 'sway/commands/seat/attach.c')
-rw-r--r--sway/commands/seat/attach.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 7615eef9..00bfdab6 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -12,7 +12,7 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
12 if (!config->handler_context.seat_config) { 12 if (!config->handler_context.seat_config) {
13 return cmd_results_new(CMD_FAILURE, "No seat defined"); 13 return cmd_results_new(CMD_FAILURE, "No seat defined");
14 } 14 }
15 if (config->reading) { 15 if (!config->active) {
16 return cmd_results_new(CMD_DEFER, NULL); 16 return cmd_results_new(CMD_DEFER, NULL);
17 } 17 }
18 18