From a3eb33a7b1394e7eae45950e0e59c471ee1475fb Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 24 Mar 2020 21:18:17 +0100 Subject: [PATCH] Handle destruction of Server properly --- src/main.zig | 2 +- src/server.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.zig b/src/main.zig index c5c2f67..86be73c 100644 --- a/src/main.zig +++ b/src/main.zig @@ -9,9 +9,9 @@ pub fn main() !void { c.wlr_log_init(c.enum_wlr_log_importance.WLR_DEBUG, null); var server = try Server.create(std.heap.c_allocator); + defer server.destroy(); try server.init(); - defer server.deinit(); try server.start(); diff --git a/src/server.zig b/src/server.zig index 7bc2daf..81dfe46 100644 --- a/src/server.zig +++ b/src/server.zig @@ -91,7 +91,7 @@ pub const Server = struct { } /// Free allocated memory and clean up - pub fn deinit(self: Self) void { + pub fn destroy(self: Self) void { c.wl_display_destroy_clients(self.wl_display); c.wl_display_destroy(self.wl_display); c.wlr_output_layout_destroy(self.wlr_output_layout);