Merge remote-tracking branch 'origin/main' into Avalonia12

# Conflicts:
#	LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj
This commit is contained in:
lincube
2026-04-29 11:49:48 +08:00
11 changed files with 873 additions and 67 deletions

View File

@@ -141,7 +141,9 @@ internal sealed class DataLocationResolver
{
try
{
var configPath = ResolveConfigPath();
// 配置文件必须位于默认系统数据路径下的 Launcher 目录中
// 避免循环依赖:不能调用 ResolveConfigPath() -> ResolveLauncherDataPath() -> ResolveDataRoot() -> LoadConfig()
var configPath = Path.Combine(_defaultSystemDataPath, LauncherFolderName, ConfigFileName);
if (!File.Exists(configPath))
{
return null;