summaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-03 14:00:37 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-02-11 10:12:43 -0500
commit743d34538333e4111a71fad32668335dff9a4822 (patch)
tree27cbb7d1e727a4fe520e4a3100bc87e3d494b8de /sway/config.c
parentMerge pull request #3551 from c-edw/RevertDoubleFrees (diff)
downloadsway-743d34538333e4111a71fad32668335dff9a4822.tar.gz
sway-743d34538333e4111a71fad32668335dff9a4822.tar.zst
sway-743d34538333e4111a71fad32668335dff9a4822.zip
Merge pull request #3563 from vilhalmer/fix-wildcard-seat-constrain-crashes-during-reconfig
Fix wildcard seat constrain crashes during reconfig
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 7cb27d95..54d29fc9 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -141,6 +141,11 @@ static void destroy_removed_seats(struct sway_config *old_config,
141 int i; 141 int i;
142 for (i = 0; i < old_config->seat_configs->length; i++) { 142 for (i = 0; i < old_config->seat_configs->length; i++) {
143 seat_config = old_config->seat_configs->items[i]; 143 seat_config = old_config->seat_configs->items[i];
144 // Skip the wildcard seat config, it won't have a matching real seat.
145 if (strcmp(seat_config->name, "*") == 0) {
146 continue;
147 }
148
144 /* Also destroy seats that aren't present in new config */ 149 /* Also destroy seats that aren't present in new config */
145 if (new_config && list_seq_find(new_config->seat_configs, 150 if (new_config && list_seq_find(new_config->seat_configs,
146 seat_name_cmp, seat_config->name) < 0) { 151 seat_name_cmp, seat_config->name) < 0) {