settings: Fix saving a new theme getting incorrect name

foxnne · Jan 29, 2025 · 6d99d3c · 6d99d3c
1 parent a6ed98c
commit 6d99d3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/editor/Settings.zig b/src/editor/Settings.zig
@@ -152,8 +152,6 @@ pub fn save(settings: *Settings, allocator: std.mem.Allocator) !void {
 }
 
 pub fn deinit(settings: *Settings, allocator: std.mem.Allocator) void {
-    if (parsed) |p| {
-        p.deinit();
-        parsed = null;
-    } else allocator.free(settings.theme);
+    defer parsed = null;
+    if (parsed) |p| p.deinit() else allocator.free(settings.theme);
 }
diff --git a/src/editor/Theme.zig b/src/editor/Theme.zig
@@ -189,10 +189,8 @@ pub fn pop(theme: *Theme) void {
 }
 
 pub fn deinit(theme: *Theme, allocator: std.mem.Allocator) void {
-    if (parsed) |p| {
-        p.deinit();
-        parsed = null;
-    } else allocator.free(theme.name);
+    defer parsed = null;
+    if (parsed) |p| p.deinit() else allocator.free(theme.name);
 }
 
 pub const StyleColorButton = struct {

diff --git a/src/editor/explorer/settings.zig b/src/editor/explorer/settings.zig
@@ -160,6 +160,9 @@ pub fn draw(core: *Core, editor: *Editor) !void {
 
             if (editor.popups.file_dialog_response) |response| {
                 if (response.type == .export_theme) {
+                    editor.theme.deinit(pixi.app.allocator);
+                    editor.theme.name = try pixi.app.allocator.dupeZ(u8, std.fs.path.basename(response.path));
+
                     try editor.theme.save(response.path);
 
                     editor.theme.deinit(pixi.app.allocator);