blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #715 from emersion/fix-rootston-tablet-tool-destroy 

rootston: fix segfault in handle_tablet_tool_destroy
This commit is contained in:
Drew DeVault 2018-03-11 11:18:55 -04:00 committed by GitHub
parent bfc0e95d2c 9d6e17fb11
commit 1c5e035884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootston/seat.c
View File

@ -514,13 +514,13 @@ static void seat_add_tablet_pad(struct roots_seat *seat,
static void handle_tablet_tool_destroy(struct wl_listener *listener, static void handle_tablet_tool_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct roots_pointer *tablet_tool = struct roots_tablet_tool *tablet_tool =
wl_container_of(listener, tablet_tool, device_destroy); wl_container_of(listener, tablet_tool, device_destroy);
struct roots_seat *seat = tablet_tool->seat; struct roots_seat *seat = tablet_tool->seat;
wl_list_remove(&tablet_tool->link);
wlr_cursor_detach_input_device(seat->cursor->cursor, tablet_tool->device); wlr_cursor_detach_input_device(seat->cursor->cursor, tablet_tool->device);
wl_list_remove(&tablet_tool->device_destroy.link); wl_list_remove(&tablet_tool->device_destroy.link);
wl_list_remove(&tablet_tool->link);
free(tablet_tool); free(tablet_tool);
seat_update_capabilities(seat); seat_update_capabilities(seat);