diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2019-02-03 20:14:45 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-02-03 20:14:45 +0100 |
| commit | 4ef5b49906700e25383a32cde0b16f1df2de250a (patch) | |
| tree | 8e54c4ee9dd0ffceecf5a99f91a341fd1d714c5e /sway/config.c | |
| parent | Merge pull request #3563 from vilhalmer/fix-wildcard-seat-constrain-crashes-d... (diff) | |
| parent | seat_cmd_cursor: do not create non-existing seat (diff) | |
| download | sway-4ef5b49906700e25383a32cde0b16f1df2de250a.tar.gz sway-4ef5b49906700e25383a32cde0b16f1df2de250a.tar.zst sway-4ef5b49906700e25383a32cde0b16f1df2de250a.zip | |
Merge pull request #3564 from RedSoxFan/seat-cursor-do-not-create
seat_cmd_cursor: do not create non-existing seat
Diffstat (limited to 'sway/config.c')
| -rw-r--r-- | sway/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c index 54d29fc9..ee1c42df 100644 --- a/sway/config.c +++ b/sway/config.c | |||
| @@ -149,8 +149,10 @@ static void destroy_removed_seats(struct sway_config *old_config, | |||
| 149 | /* Also destroy seats that aren't present in new config */ | 149 | /* Also destroy seats that aren't present in new config */ |
| 150 | if (new_config && list_seq_find(new_config->seat_configs, | 150 | if (new_config && list_seq_find(new_config->seat_configs, |
| 151 | seat_name_cmp, seat_config->name) < 0) { | 151 | seat_name_cmp, seat_config->name) < 0) { |
| 152 | seat = input_manager_get_seat(seat_config->name); | 152 | seat = input_manager_get_seat(seat_config->name, false); |
| 153 | seat_destroy(seat); | 153 | if (seat) { |
| 154 | seat_destroy(seat); | ||
| 155 | } | ||
| 154 | } | 156 | } |
| 155 | } | 157 | } |
| 156 | } | 158 | } |