From 23b90d8e69d203697c5548fdd140bf3052749dfa Mon Sep 17 00:00:00 2001 From: Luminarys Date: Tue, 18 Aug 2015 10:39:37 -0500 Subject: [PATCH] Fixed mouse clicks from triggering a segfault --- sway/handlers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/handlers.c b/sway/handlers.c index cd97ab431..4980f65cd 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -322,7 +322,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct int i = 0; // Do checks to determine if proper keys are being held swayc_t *view = active_workspace->focused; - if (m1_held) { + if (m1_held && view) { if (view->is_floating) { while (keys_pressed[i++]) { if (keys_pressed[i] == config->floating_mod) { @@ -338,7 +338,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct } } } - } else if (m2_held) { + } else if (m2_held && view) { if (view->is_floating) { while (keys_pressed[i++]) { if (keys_pressed[i] == config->floating_mod) {