From 642c36bacfbfb71d375f5ac5146eb481bae165bd Mon Sep 17 00:00:00 2001
From: Frank Skare <frank.skare.de@gmail.com>
Date: Fri, 30 Apr 2021 15:09:31 +0200
Subject: [PATCH] wpf error handling

---
 mpv.net/WPF/WPF.cs           | 4 +++-
 mpv.net/WinForms/MainForm.cs | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mpv.net/WPF/WPF.cs b/mpv.net/WPF/WPF.cs
index 853552b..4fd0b64 100644
--- a/mpv.net/WPF/WPF.cs
+++ b/mpv.net/WPF/WPF.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Windows;
 
-namespace WPF
+namespace mpvnet
 {
     public class WPF
     {
@@ -15,6 +15,8 @@ namespace WPF
                 Application.Current.Resources.MergedDictionaries.Add(
                     Application.LoadComponent(new Uri("mpvnet;component/WPF/Resources.xaml",
                         UriKind.Relative)) as ResourceDictionary);
+
+                Application.Current.DispatcherUnhandledException += (sender, e) => App.ShowException(e.Exception);
             }
         }
     }
diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs
index 36c7ef3..e0a395e 100644
--- a/mpv.net/WinForms/MainForm.cs
+++ b/mpv.net/WinForms/MainForm.cs
@@ -86,6 +86,7 @@ namespace mpvnet
 
                 AppDomain.CurrentDomain.UnhandledException += (sender, e) => App.ShowException(e.ExceptionObject);
                 Application.ThreadException += (sender, e) => App.ShowException(e.Exception);
+             
                 Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
 
                 TaskbarButtonCreatedMessage = RegisterWindowMessage("TaskbarButtonCreated");
@@ -844,7 +845,7 @@ namespace mpvnet
 
             BuildMenu();
             ContextMenuStrip = ContextMenu;
-            WPF.WPF.Init();
+            WPF.Init();
             System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
             Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y);
             MinimumSize = new Size(FontHeight * 9, FontHeight * 9);