mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: don't double load app support path on macOS (#11326)

Browse Source 
Fixes #11323
This commit is contained in:
Mitchell Hashimoto
2026-03-10 09:28:59 -07:00
committed by GitHub
parent 3782d118e1 d9039eb85a
commit 9759787847
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/config/Config.zig
View File

@@ -4013,10 +4013,28 @@ pub fn loadDefaultFiles(self: *Config, alloc: Allocator) !void {
const app_support_path = try file_load.preferredAppSupportPath(alloc);
defer alloc.free(app_support_path);
const app_support_loaded: bool = loaded: {
const legacy_app_support_action = self.loadOptionalFile(alloc, legacy_app_support_path);
const app_support_action = self.loadOptionalFile(alloc, app_support_path);
const legacy_app_support_action = self.loadOptionalFile(
alloc,
legacy_app_support_path,
);
// The app support path and legacy may be the same, since we
// use the `preferred` call above. If its the same, avoid
// a double-load.
const app_support_action: OptionalFileAction = if (!std.mem.eql(
u8,
legacy_app_support_path,
app_support_path,
)) self.loadOptionalFile(
alloc,
app_support_path,
) else .not_found;
if (app_support_action != .not_found and legacy_app_support_action != .not_found) {
log.warn("both config files `{s}` and `{s}` exist.", .{ legacy_app_support_path, app_support_path });
log.warn(
"both config files `{s}` and `{s}` exist.",
.{ legacy_app_support_path, app_support_path },
);
log.warn("loading them both in that order", .{});
break :loaded true;
}