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

Merge pull request #1227 from emersion/rootston-segfault-tablet-destroy 

rootston: fix segfault on tablet pad destroy
This commit is contained in:
Drew DeVault 2018-09-10 21:11:32 -04:00 committed by GitHub
parent 7ba50469e0 62af1c630a
commit 76ad4804bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootston/seat.c
View File

@ -745,6 +745,7 @@ static void attach_tablet_pad(struct roots_tablet_pad *pad,
pad->tablet = tool; pad->tablet = tool;
wl_list_remove(&pad->tablet_destroy.link);
pad->tablet_destroy.notify = handle_pad_tool_destroy; pad->tablet_destroy.notify = handle_pad_tool_destroy;
wl_signal_add(&tool->device->events.destroy, &pad->tablet_destroy); wl_signal_add(&tool->device->events.destroy, &pad->tablet_destroy);
} }
@ -812,7 +813,8 @@ static void seat_add_tablet_pad(struct roots_seat *seat,
&tablet_pad->device_destroy); &tablet_pad->device_destroy);
tablet_pad->attach.notify = handle_tablet_pad_attach; tablet_pad->attach.notify = handle_tablet_pad_attach;
wl_signal_add(&tablet_pad->device->tablet_pad->events.attach_tablet, &tablet_pad->attach); wl_signal_add(&tablet_pad->device->tablet_pad->events.attach_tablet,
&tablet_pad->attach);
tablet_pad->button.notify = handle_tablet_pad_button; tablet_pad->button.notify = handle_tablet_pad_button;
wl_signal_add(&tablet_pad->device->tablet_pad->events.button, &tablet_pad->button); wl_signal_add(&tablet_pad->device->tablet_pad->events.button, &tablet_pad->button);
@ -823,6 +825,8 @@ static void seat_add_tablet_pad(struct roots_seat *seat,
tablet_pad->ring.notify = handle_tablet_pad_ring; tablet_pad->ring.notify = handle_tablet_pad_ring;
wl_signal_add(&tablet_pad->device->tablet_pad->events.ring, &tablet_pad->ring); wl_signal_add(&tablet_pad->device->tablet_pad->events.ring, &tablet_pad->ring);
wl_list_init(&tablet_pad->tablet_destroy.link);
struct roots_desktop *desktop = seat->input->server->desktop; struct roots_desktop *desktop = seat->input->server->desktop;
tablet_pad->tablet_v2_pad = tablet_pad->tablet_v2_pad =
wlr_tablet_pad_create(desktop->tablet_v2, seat->seat, device); wlr_tablet_pad_create(desktop->tablet_v2, seat->seat, device);