Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

layout: cleanup in progress layout demand on destroy

Browse source 
This fixes an issue where a layout client that crashed during a layout
demand caused river to enter invalid state and potentially soft-lock.
This commit is contained in:
Isaac Freund 2021-07-24 14:14:36 +02:00
parent 6f91011895
commit 9c633a7888
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
river/Layout.zig
View file

@ -173,13 +173,14 @@ pub fn destroy(self: *Self) void {
const node = @fieldParentPtr(std.TailQueue(Self).Node, "data", self); const node = @fieldParentPtr(std.TailQueue(Self).Node, "data", self);
self.output.layouts.remove(node); self.output.layouts.remove(node);
// If we are the currently active layout of an output, clean up. The output // If we are the currently active layout of an output, clean up.
// will always end up with no layout at this point, so we directly start the if (self.output.pending.layout == self) {
// transaction.
if (self == self.output.pending.layout) {
self.output.pending.layout = null; self.output.pending.layout = null;
self.output.arrangeViews(); if (self.output.layout_demand) |*layout_demand| {
server.root.startTransaction(); layout_demand.deinit();
self.output.layout_demand = null;
server.root.notifyLayoutDemandDone();
}
} }
self.layout.setHandler(?*c_void, handleRequestInert, null, null); self.layout.setHandler(?*c_void, handleRequestInert, null, null);