aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-03-24 21:18:17 +0100
committerIsaac Freund <ifreund@ifreund.xyz>2020-03-24 21:18:17 +0100
commita3eb33a7b1394e7eae45950e0e59c471ee1475fb (patch)
tree12f631c6b42e784fc5705956c140351d93cfac2f
parentaaecef8c5c4609ef838c47271056d2b93695fb89 (diff)
downloadriver-a3eb33a7b1394e7eae45950e0e59c471ee1475fb.tar.gz
river-a3eb33a7b1394e7eae45950e0e59c471ee1475fb.tar.xz
Handle destruction of Server properly
-rw-r--r--src/main.zig2
-rw-r--r--src/server.zig2
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);