Merge pull request #2850 from DGP-Studio/develop

Author: Lightczx

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/ExceptionHandlingSupport.cs

@@ -22,26 +22,25 @@ public static void Initialize(IServiceProvider serviceProvider, Application app)
         serviceProvider.GetRequiredService<ExceptionHandlingSupport>().Attach(app);
     }
 
+    /// <summary>
+    /// Kill the current process if the exception is or has a DbException.
+    /// As this method does not throw, it should only be used in catch blocks
+    /// </summary>
+    /// <param name="exception">Incoming exception</param>
+    /// <returns>Unwrapped DbException or original exception</returns>
     [StackTraceHidden]
-    public static void KillProcessOnDbException(Exception exception)
+    public static Exception KillProcessOnDbExceptionNoThrow(Exception exception)
     {
-        ExceptionDispatchInfo dispatch = ExceptionDispatchInfo.Capture(exception);
-
-        switch (dispatch.SourceException)
+        return exception switch
         {
-            case DbException dbException:
-                throw KillProcessOnDbException(dbException);
-            case DbUpdateException { InnerException: DbException dbException2 }:
-                throw KillProcessOnDbException(dbException2);
-            default:
-                // In case it's not a DbException, we should preserve the original stack trace
-                dispatch.Throw();
-                break;
-        }
+            DbException dbException => KillProcessOnDbException(dbException),
+            DbUpdateException { InnerException: DbException dbException2 } => KillProcessOnDbException(dbException2),
+            _ => exception,
+        };
     }
 
     [StackTraceHidden]
-    public static DbException KillProcessOnDbException(DbException exception)
+    private static DbException KillProcessOnDbException(DbException exception)
     {
         HutaoNative.Instance.ShowErrorMessage("Warning | 警告", exception.Message);
         Process.GetCurrentProcess().Kill();
@@ -60,7 +59,7 @@ private static void OnAppUnhandledException(object? sender, Microsoft.UI.Xaml.Un
         Debugger.Break();
         XamlApplicationLifetime.Exiting = true;
 
-        KillProcessOnDbException(e.Exception);
+        KillProcessOnDbExceptionNoThrow(e.Exception);
 
         // https://github.com/getsentry/sentry-dotnet/blob/main/src/Sentry/Integrations/WinUIUnhandledExceptionIntegration.cs
         exception.SetSentryMechanism("Microsoft.UI.Xaml.UnhandledException", handled: false);

src/Snap.Hutao/Snap.Hutao/Core/Threading/TaskExtension.cs

@@ -19,7 +19,7 @@ public static async void SafeForget(this Task task)
         }
         catch (Exception ex)
         {
-            ExceptionHandlingSupport.KillProcessOnDbException(ex);
+            ExceptionHandlingSupport.KillProcessOnDbExceptionNoThrow(ex);
             ex.SetSentryMechanism("TaskExtension.SafeForget", handled: true);
             SentrySdk.CaptureException(ex);
         }
@@ -37,7 +37,7 @@ public static async void SafeForget(this ValueTask task)
         }
         catch (Exception ex)
         {
-            ExceptionHandlingSupport.KillProcessOnDbException(ex);
+            ExceptionHandlingSupport.KillProcessOnDbExceptionNoThrow(ex);
             ex.SetSentryMechanism("TaskExtension.SafeForget", handled: true);
             SentrySdk.CaptureException(ex);
         }

src/Snap.Hutao/Snap.Hutao/Package.appxmanifest

@@ -13,7 +13,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutao"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.15.6.0" />
+    Version="1.15.7.0" />
 
   <Properties>
     <DisplayName>Snap Hutao</DisplayName>

src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest

@@ -13,7 +13,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutaoDev"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.15.6.0" />
+    Version="1.15.7.0" />
 
   <Properties>
     <DisplayName>Snap Hutao Dev</DisplayName>