aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-03 14:00:37 -0500
committerGitHub <noreply@github.com>2019-02-03 14:00:37 -0500
commit8e60efe0bf771120818b675d54c87b091c68fd70 (patch)
tree27cbb7d1e727a4fe520e4a3100bc87e3d494b8de /sway/input
parentbbfe13a24893bac6a5c41ac39115288d1d6e025f (diff)
parentf8a91171491c1e8a3591461aa540511ec4fe4875 (diff)
downloadsway-8e60efe0bf771120818b675d54c87b091c68fd70.tar.xz
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.c6
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) {
void sway_cursor_constrain(struct sway_cursor *cursor,
struct wlr_pointer_constraint_v1 *constraint) {
struct seat_config *config = seat_get_config(cursor->seat);
- if (config->allow_constrain == CONSTRAIN_DISABLE) {
+ if (!config) {
+ config = seat_get_config_by_name("*");
+ }
+
+ if (!config || config->allow_constrain == CONSTRAIN_DISABLE) {
return;
}