Merge pull request #137 from Corona-Studio/hotfix

Update ProjBobcat.csproj
Corona-Studio · Mar 31, 2024 · 0da2a64 · 0da2a64
2 parents bc0e71c + 99f0bff
commit 0da2a64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
@@ -31,7 +31,7 @@ public sealed class DefaultVersionLocator : VersionLocatorBase
     /// <param name="clientToken"></param>
     public DefaultVersionLocator(string rootPath, Guid clientToken) : base(rootPath)
     {
-        LauncherProfileParser = new DefaultLauncherProfileParser(rootPath, clientToken);
+        LauncherProfileParser ??= new DefaultLauncherProfileParser(rootPath, clientToken);
 
         //防止给定路径不存在的时候Parser遍历文件夹爆炸。
         //Prevents errors in the parser's folder traversal when the given path does not exist.
@@ -590,14 +590,23 @@ void ProcessProfile(VersionInfo result, string id)
 
         if (string.IsNullOrEmpty(oldProfileKey) || oldProfileModel == null)
         {
-            LauncherProfileParser.LauncherProfile.Profiles!.Add(gameId,
-                new GameProfileModel
-                {
-                    GameDir = gamePath,
-                    LastVersionId = id,
-                    Name = id,
-                    Created = DateTime.Now
-                });
+            var gameProfile = new GameProfileModel
+            {
+                GameDir = gamePath,
+                LastVersionId = id,
+                Name = id,
+                Created = DateTime.Now
+            };
+
+            if (!string.IsNullOrEmpty(oldProfileKey) &&
+                LauncherProfileParser.LauncherProfile.Profiles!.ContainsKey(oldProfileKey))
+            {
+                LauncherProfileParser.LauncherProfile.Profiles![oldProfileKey] = gameProfile;
+                LauncherProfileParser.SaveProfile();
+                return;
+            }
+
+            LauncherProfileParser.LauncherProfile.Profiles!.Add(gameId, gameProfile);
             LauncherProfileParser.SaveProfile();
 
             return;

diff --git a/ProjBobcat/ProjBobcat/ProjBobcat.csproj b/ProjBobcat/ProjBobcat/ProjBobcat.csproj
@@ -73,7 +73,7 @@ resolved the issue that LaunchWrapper may not return the correct exit code
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>