mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

layer: handle output_destroy.notify without crash

Browse source 
Steps to reproduce crash:
- run nested with two outputs (e.g. WLR_WL_OUTPUTS=2 ./build/labwc)
- start panel on one output (e.g. waybar)
- close that output

Backtrace pointed to output_destroy_notify() at ../src/layers.c:92

Reported-by: @Consolatis
This commit is contained in:
Johan Malm 2022-04-24 22:24:47 +01:00
parent 73930f7e0f
commit bb2a98645b
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/layers.c
View file

@ -88,8 +88,7 @@ output_destroy_notify(struct wl_listener *listener, void *data)
{ {
struct lab_layer_surface *layer = struct lab_layer_surface *layer =
wl_container_of(listener, layer, output_destroy); wl_container_of(listener, layer, output_destroy);
wl_list_remove(&layer->output_destroy.link); layer->scene_layer_surface->layer_surface->output = NULL;
wlr_layer_surface_v1_destroy(layer->scene_layer_surface->layer_surface);
} }
static void static void
@ -322,6 +321,12 @@ new_layer_surface_notify(struct wl_listener *listener, void *data)
surface->scene_layer_surface = wlr_scene_layer_surface_v1_create( surface->scene_layer_surface = wlr_scene_layer_surface_v1_create(
&selected_layer->node, layer_surface); &selected_layer->node, layer_surface);
if (!surface->scene_layer_surface) {
wlr_layer_surface_v1_destroy(layer_surface);
wlr_log(WLR_ERROR, "could not create layer surface");
return;
}
node_descriptor_create(surface->scene_layer_surface->node, node_descriptor_create(surface->scene_layer_surface->node,
LAB_NODE_DESC_LAYER_SURFACE, surface); LAB_NODE_DESC_LAYER_SURFACE, surface);