Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 04:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[PowerToys Run] Fix error reporting window for exceptions that are not on the dispatcher thread (#6221)

Browse Source 
* Possible fix for dispatcher error

* Revert changes on other files
This commit is contained in:
Arjun Balgovind
2020-08-31 10:22:00 -07:00
committed by GitHub
parent 777e1dc48c
commit 0349383d08
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
View File

@@ -12,7 +12,7 @@ namespace PowerLauncher.Helper
{ {
public static class ErrorReporting public static class ErrorReporting
{ {
private static void Report(Exception e) private static void Report(Exception e, bool waitForClose)
{ {
if (e != null) if (e != null)
{ {
@@ -20,20 +20,31 @@ namespace PowerLauncher.Helper
logger.Fatal(ExceptionFormatter.FormatException(e)); logger.Fatal(ExceptionFormatter.FormatException(e));
var reportWindow = new ReportWindow(e); var reportWindow = new ReportWindow(e);
reportWindow.Show();
if (waitForClose)
{
reportWindow.ShowDialog();
}
else
{
reportWindow.Show();
}
} }
} }
public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e) public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
{ {
// handle non-ui thread exceptions // handle non-ui thread exceptions
Report((Exception)e?.ExceptionObject); System.Windows.Application.Current.Dispatcher.Invoke(() =>
{
Report((Exception)e?.ExceptionObject, true);
});
} }
public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e) public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{ {
// handle ui thread exceptions // handle ui thread exceptions
Report(e?.Exception); Report(e?.Exception, false);
// prevent application exist, so the user can copy prompted error info // prevent application exist, so the user can copy prompted error info
e.Handled = true; e.Handled = true;