Backport proper exception handling in win32 system dialogs

donandren · Jul 28, 2022 · 2d2cd97 · 2d2cd97
1 parent 7fb8c01
commit 2d2cd97
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -117,7 +117,8 @@ internal class SystemDialogImpl : ISystemDialogImpl
                 }
                 catch (COMException ex)
                 {
-                    throw new Win32Exception(ex.HResult);
+                    var message = new Win32Exception(ex.HResult).Message;
+                    throw new COMException(message, ex);
                 }
             })!;
         }
@@ -176,7 +177,8 @@ internal class SystemDialogImpl : ISystemDialogImpl
                 }
                 catch (COMException ex)
                 {
-                    throw new Win32Exception(ex.HResult);
+                    var message = new Win32Exception(ex.HResult).Message;
+                    throw new COMException(message, ex);
                 }
             });
         }