diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-11 11:18:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-11 11:18:55 -0400 |
| commit | 1c5e035884018b2f78ad4f8ee44177c45ddf2892 (patch) | |
| tree | 73f12de07ecca01e15f41a4c5df2b223fefe6377 | |
| parent | bfc0e95d2cfeab96d771cb34e78ca92afee4464c (diff) | |
| parent | 9d6e17fb1100673223545780a9229693664c38ad (diff) | |
Merge pull request #715 from emersion/fix-rootston-tablet-tool-destroy
rootston: fix segfault in handle_tablet_tool_destroy
| -rw-r--r-- | rootston/seat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index 9acbb737..8ac41f6c 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -514,13 +514,13 @@ static void seat_add_tablet_pad(struct roots_seat *seat, static void handle_tablet_tool_destroy(struct wl_listener *listener, void *data) { - struct roots_pointer *tablet_tool = + struct roots_tablet_tool *tablet_tool = wl_container_of(listener, tablet_tool, device_destroy); struct roots_seat *seat = tablet_tool->seat; - wl_list_remove(&tablet_tool->link); wlr_cursor_detach_input_device(seat->cursor->cursor, tablet_tool->device); wl_list_remove(&tablet_tool->device_destroy.link); + wl_list_remove(&tablet_tool->link); free(tablet_tool); seat_update_capabilities(seat); |