Merge pull request #2346 from RyanDwyer/fix-crash-on-click

Fix crash when clicking certain surfaces
This commit is contained in:
Drew DeVault 2018-07-24 07:50:55 -04:00 committed by GitHub
commit 347f7cb4c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -570,7 +570,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
// Handle mouse bindings // Handle mouse bindings
bool on_border = find_resize_edge(cont, cursor) != WLR_EDGE_NONE; bool on_border = cont && (find_resize_edge(cont, cursor) != WLR_EDGE_NONE);
bool on_contents = !on_border && surface; bool on_contents = !on_border && surface;
bool on_titlebar = !on_border && !surface; bool on_titlebar = !on_border && !surface;
struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(cursor->seat->wlr_seat); struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(cursor->seat->wlr_seat);