From e82b94c33c1b2a4b26e7a76d0ea82a3364cd40f4 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 06 Apr 2025 09:39:05 +0800 Subject: [PATCH] Fix load ordering issue that causes the forge title to disappear --- forged/internal/unsorted/server.go | 8 ++++---- diff --git a/forged/internal/unsorted/server.go b/forged/internal/unsorted/server.go index c7caa7674bba2f72373cd1971fab8747e7cfe823..7d1319d682d0f379cb2bfc2c47ea6df903ab80f7 100644 --- a/forged/internal/unsorted/server.go +++ b/forged/internal/unsorted/server.go @@ -55,10 +55,6 @@ s := &Server{ globalData: make(map[string]any), } //exhaustruct:ignore - if err := s.loadConfig(configPath); err != nil { - return s, err - } - s.sourceHandler = http.StripPrefix( "/-/source/", http.FileServer(http.FS(embed.Source)), @@ -73,6 +69,10 @@ "server_public_key_string": &s.serverPubkeyString, "server_public_key_fingerprint": &s.serverPubkeyFP, "forge_version": version, // Some other ones are populated after config parsing + } + + if err := s.loadConfig(configPath); err != nil { + return s, err } misc.NoneOrPanic(s.loadTemplates()) -- 2.48.1