修复更新程序触发网络错误导致崩溃的问题

CHKZL · Jun 3, 2024 · d0f948b · d0f948b
1 parent 4acb409
commit d0f948b
Showing 1 changed file with 29 additions and 21 deletions.
diff --git a/Core/Tools/ProgramUpdates.cs b/Core/Tools/ProgramUpdates.cs
@@ -46,11 +46,11 @@ internal static bool GetCurrentVersion()
                 if (ver.ToLower().StartsWith("dev"))
                 {
                     Isdev = true;
-                    ver = ver.ToLower().Replace("dev","");
+                    ver = ver.ToLower().Replace("dev", "");
                 }
                 else
                 {
-                    ver = ver.ToLower().Replace("release","");
+                    ver = ver.ToLower().Replace("release", "");
                 }
                 if (!string.IsNullOrEmpty(type) && !string.IsNullOrEmpty(ver))
                 {
@@ -68,34 +68,42 @@ public static async Task<bool> CheckForNewVersions(bool AutoUpdate = false, bool
         {
             return await Task.Run(() =>
             {
-                if (!GetCurrentVersion())
+                try
                 {
-                    return false;
-                }
-                string DL_VerFileUrl = $"{Url}/{type}/{(Isdev ? "dev" : "release")}/ver.ini";
-                string R_Ver = Get(DL_VerFileUrl).TrimEnd().Replace("dev","").Replace("release","");
-                if (!string.IsNullOrEmpty(R_Ver) && R_Ver.Split('.').Length > 0)
-                {
-                    //老版本
-                    Version Before = new Version(ver);
-                    //新版本
-                    Version After = new Version(R_Ver);
-                    if (After > Before)
+                    if (!GetCurrentVersion())
                     {
-                        if (!Manual)
-                            NewVersionAvailableEvent?.Invoke(R_Ver, new EventArgs());
-                        if (AutoUpdate)
-                            CallUpUpdateProgram();
-                        return true;
+                        return false;
+                    }
+                    string DL_VerFileUrl = $"{Url}/{type}/{(Isdev ? "dev" : "release")}/ver.ini";
+                    string R_Ver = Get(DL_VerFileUrl).TrimEnd().Replace("dev", "").Replace("release", "");
+                    if (!string.IsNullOrEmpty(R_Ver) && R_Ver.Split('.').Length > 0)
+                    {
+                        //老版本
+                        Version Before = new Version(ver);
+                        //新版本
+                        Version After = new Version(R_Ver);
+                        if (After > Before)
+                        {
+                            if (!Manual)
+                                NewVersionAvailableEvent?.Invoke(R_Ver, new EventArgs());
+                            if (AutoUpdate)
+                                CallUpUpdateProgram();
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
+                        }
                     }
                     else
                     {
+                        Log.Info(nameof(ProgramUpdates), $"获取新版本失败，请检查网络和代理状况");
                         return false;
                     }
                 }
-                else
+                catch (Exception ex)
                 {
-                    Log.Info(nameof(ProgramUpdates), $"获取新版本失败，请检查网络和代理状况");
+                    Log.Error(nameof(ProgramUpdates), $"获取新版本出现错误，错误堆栈:{ex.ToString()}", ex);
                     return false;
                 }
             });