Recents: Settings: Hopefully allow function to actually return defaul…

…t if file load fails
foxnne · Feb 1, 2025 · 57ddca8 · 57ddca8
1 parent 8c24618
commit 57ddca8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/editor/Recents.zig b/src/editor/Recents.zig
@@ -10,8 +10,7 @@ pub fn load(allocator: std.mem.Allocator) !Recents {
     var folders = std.ArrayList([:0]const u8).init(allocator);
     var exports = std.ArrayList([:0]const u8).init(allocator);
 
-    const read_opt: ?[]const u8 = pixi.fs.read(allocator, "recents.json") catch null;
-    if (read_opt) |read| {
+    if (pixi.fs.read(allocator, "recents.json") catch null) |read| {
         defer allocator.free(read);
 
         const options = std.json.ParseOptions{ .duplicate_field_behavior = .use_first, .ignore_unknown_fields = true };

diff --git a/src/editor/Settings.zig b/src/editor/Settings.zig
@@ -130,13 +130,14 @@ color_chip_radius: f32 = 12.0,
 
 /// Loads settings or if fails, returns default settings
 pub fn loadOrDefault(allocator: std.mem.Allocator) !Settings {
-    const data = try pixi.fs.read(allocator, "settings.json");
-    defer allocator.free(data);
-
-    const options = std.json.ParseOptions{ .duplicate_field_behavior = .use_first, .ignore_unknown_fields = true };
-    if (std.json.parseFromSlice(Settings, allocator, data, options) catch null) |p| {
-        parsed = p;
-        return p.value;
+    if (pixi.fs.read(allocator, "settings.json") catch null) |data| {
+        defer allocator.free(data);
+
+        const options = std.json.ParseOptions{ .duplicate_field_behavior = .use_first, .ignore_unknown_fields = true };
+        if (std.json.parseFromSlice(Settings, allocator, data, options) catch null) |p| {
+            parsed = p;
+            return p.value;
+        }
     }
 
     return .{