diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-03 14:00:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-03 14:00:37 -0500 |
commit | 8e60efe0bf771120818b675d54c87b091c68fd70 (patch) | |
tree | 27cbb7d1e727a4fe520e4a3100bc87e3d494b8de /sway/input | |
parent | Merge pull request #3551 from c-edw/RevertDoubleFrees (diff) | |
parent | Fall back to wildcard in sway_cursor_constrain (diff) | |
download | sway-8e60efe0bf771120818b675d54c87b091c68fd70.tar.gz sway-8e60efe0bf771120818b675d54c87b091c68fd70.tar.zst sway-8e60efe0bf771120818b675d54c87b091c68fd70.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/input')
-rw-r--r-- | sway/input/cursor.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index c38d8d3a..01aae79d 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -1459,7 +1459,11 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) { | |||
1459 | void sway_cursor_constrain(struct sway_cursor *cursor, | 1459 | void sway_cursor_constrain(struct sway_cursor *cursor, |
1460 | struct wlr_pointer_constraint_v1 *constraint) { | 1460 | struct wlr_pointer_constraint_v1 *constraint) { |
1461 | struct seat_config *config = seat_get_config(cursor->seat); | 1461 | struct seat_config *config = seat_get_config(cursor->seat); |
1462 | if (config->allow_constrain == CONSTRAIN_DISABLE) { | 1462 | if (!config) { |
1463 | config = seat_get_config_by_name("*"); | ||
1464 | } | ||
1465 | |||
1466 | if (!config || config->allow_constrain == CONSTRAIN_DISABLE) { | ||
1463 | return; | 1467 | return; |
1464 | } | 1468 | } |
1465 | 1469 | ||