summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-09-25 16:46:38 -0400
committerLibravatar GitHub <noreply@github.com>2018-09-25 16:46:38 -0400
commitc43374cdf043e913b48d3cdb31d0f716a2cf58bd (patch)
tree0bf04368b0f6972e343aa9eea64075d5fca5f102
parentMerge pull request #2708 from RyanDwyer/fix-output-disconnect-crash (diff)
parentAdd a missing null check for moving tiling containers (diff)
downloadsway-c43374cdf043e913b48d3cdb31d0f716a2cf58bd.tar.gz
sway-c43374cdf043e913b48d3cdb31d0f716a2cf58bd.tar.zst
sway-c43374cdf043e913b48d3cdb31d0f716a2cf58bd.zip
Merge pull request #2712 from alexbakker/fix-crash
Add a missing null check for moving tiling containers
-rw-r--r--sway/input/cursor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 5111e8e5..aa0e07f5 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -897,7 +897,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
897 897
898 // Handle moving a tiling container 898 // Handle moving a tiling container
899 if (config->tiling_drag && mod_pressed && state == WLR_BUTTON_PRESSED && 899 if (config->tiling_drag && mod_pressed && state == WLR_BUTTON_PRESSED &&
900 !is_floating_or_child && !cont->is_fullscreen) { 900 !is_floating_or_child && cont && !cont->is_fullscreen) {
901 seat_pointer_notify_button(seat, time_msec, button, state); 901 seat_pointer_notify_button(seat, time_msec, button, state);
902 seat_begin_move_tiling(seat, cont, button); 902 seat_begin_move_tiling(seat, cont, button);
903 return; 903 return;