mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: fix display destroy listener double removal

Browse source 
Fixes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3762
This commit is contained in:
Kirill Primak 2023-11-23 21:20:15 +03:00
parent 504b9491f0
commit 78a09573af
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types/output/output.c
View file

@ -146,7 +146,6 @@ void wlr_output_create_global(struct wlr_output *output, struct wl_display *disp
} }
wl_list_remove(&output->display_destroy.link); wl_list_remove(&output->display_destroy.link);
output->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &output->display_destroy); wl_display_add_destroy_listener(display, &output->display_destroy);
} }
@ -443,7 +442,9 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
} }
wlr_addon_set_init(&output->addons); wlr_addon_set_init(&output->addons);
wl_list_init(&output->display_destroy.link); wl_list_init(&output->display_destroy.link);
output->display_destroy.notify = handle_display_destroy;
if (state) { if (state) {
output_apply_state(output, state); output_apply_state(output, state);
@ -455,10 +456,11 @@ void wlr_output_destroy(struct wlr_output *output) {
return; return;
} }
wl_list_remove(&output->display_destroy.link);
wlr_output_destroy_global(output); wlr_output_destroy_global(output);
output_clear_back_buffer(output); output_clear_back_buffer(output);
wl_list_remove(&output->display_destroy.link);
wl_signal_emit_mutable(&output->events.destroy, output); wl_signal_emit_mutable(&output->events.destroy, output);
wlr_addon_set_finish(&output->addons); wlr_addon_set_finish(&output->addons);