diff options
author | vilhalmer <vil@vil.lv> | 2019-02-03 13:41:35 -0500 |
---|---|---|
committer | vilhalmer <vil@vil.lv> | 2019-02-03 13:41:35 -0500 |
commit | da59ffa8a059f6504868f4d93c5d62f099ab77b6 (patch) | |
tree | c62a18e15bec32293642cb17106064fd0633f5d1 /sway/config.c | |
parent | Merge pull request #3551 from c-edw/RevertDoubleFrees (diff) | |
download | sway-da59ffa8a059f6504868f4d93c5d62f099ab77b6.tar.gz sway-da59ffa8a059f6504868f4d93c5d62f099ab77b6.tar.zst sway-da59ffa8a059f6504868f4d93c5d62f099ab77b6.zip |
Skip wildcard seat config in destroy_removed_seats
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 5 |
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) { |