Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash destroying output with layer surfaces

Browse Source
This commit is contained in:
Isaac Freund 2020-05-19 11:08:49 +02:00
parent f818ce7e38
commit 8b69c38cff
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Output.zig
View File

@ -502,14 +502,14 @@ fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
for (self.layers) |*layer, layer_idx| { for (self.layers) |*layer, layer_idx| {
while (layer.pop()) |node| { while (layer.pop()) |node| {
const layer_surface = &node.data; const layer_surface = &node.data;
c.wlr_layer_surface_v1_close(layer_surface.wlr_layer_surface);
// We need to move the closing layer surface to the noop output // We need to move the closing layer surface to the noop output
// since it is not immediately destoryed. This just a request // since it may not be immediately destoryed. This just a request
// to close which will trigger unmap and destroy events in // to close which will trigger unmap and destroy events in
// response, and the LayerSurface needs a valid output to // response, and the LayerSurface needs a valid output to
// handle them. // handle them.
root.noop_output.layers[layer_idx].prepend(node); root.noop_output.layers[layer_idx].prepend(node);
layer_surface.output = &root.noop_output; layer_surface.output = &root.noop_output;
c.wlr_layer_surface_v1_close(layer_surface.wlr_layer_surface);
} }
} }