aboutsummaryrefslogtreecommitdiff
path: root/src/server.zig
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-04-18 12:21:43 +0200
committerIsaac Freund <ifreund@ifreund.xyz>2020-04-18 12:21:43 +0200
commitcd19a4615b822ab85ebe1430ec956f6b22f3d008 (patch)
treec3b9cd94870ecb8e37c5ca9d29cd1077c7820bef /src/server.zig
parented7aca261bc51790334a0adc9e00df5eda6dbc83 (diff)
downloadriver-cd19a4615b822ab85ebe1430ec956f6b22f3d008.tar.gz
river-cd19a4615b822ab85ebe1430ec956f6b22f3d008.tar.xz
Properly clean up resources on exit
Diffstat (limited to 'src/server.zig')
-rw-r--r--src/server.zig6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server.zig b/src/server.zig
index df1beb3..8371860 100644
--- a/src/server.zig
+++ b/src/server.zig
@@ -99,10 +99,12 @@ pub const Server = struct {
}
/// Free allocated memory and clean up
- pub fn destroy(self: Self) void {
+ pub fn deinit(self: *Self) void {
+ // Note: order is important here
c.wl_display_destroy_clients(self.wl_display);
c.wl_display_destroy(self.wl_display);
- self.root.destroy();
+ self.input_manager.deinit();
+ self.root.deinit();
}
/// Create the socket, set WAYLAND_DISPLAY, and start the backend