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

Root: fix crash on deinit()

Browse Source
This commit is contained in:
Isaac Freund 2024-02-20 22:57:59 +01:00
parent a04c18819b
commit 53c09be846
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
river/Root.zig
View File

@ -192,7 +192,6 @@ pub fn init(self: *Self) !void {
} }
pub fn deinit(self: *Self) void { pub fn deinit(self: *Self) void {
self.scene.tree.node.destroy();
self.output_layout.destroy(); self.output_layout.destroy();
self.transaction_timeout.remove(); self.transaction_timeout.remove();
} }

6
river/Server.zig
View File

@ -190,6 +190,12 @@ pub fn deinit(self: *Self) void {
self.wl_server.destroyClients(); self.wl_server.destroyClients();
self.backend.destroy(); self.backend.destroy();
// The scene graph needs to be destroyed after the backend but before the renderer
// Output destruction requires the scene graph to still be around while the scene
// graph may require the renderer to still be around to destroy textures it seems.
self.root.scene.tree.node.destroy();
self.renderer.destroy(); self.renderer.destroy();
self.allocator.destroy(); self.allocator.destroy();