Log exceptions

antonpup · Oct 10, 2019 · 040c0f3 · 040c0f3
1 parent 91f3e9d
commit 040c0f3
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs b/Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs
@@ -753,19 +753,18 @@ private void razer_wrapper_install_button_Click(object sender, RoutedEventArgs e
         {
             void HandleExceptions(AggregateException ae)
             {
+                ShowMessageBox(ae.ToString(), "Exception!", MessageBoxImage.Error);
                 ae.Handle(ex => {
-                    Application.Current.Dispatcher.Invoke(() =>
-                            System.Windows.MessageBox.Show(ex.ToString(), "Exception!",
-                                                        MessageBoxButton.OK, MessageBoxImage.Error));
+                    Global.logger.Error(ex.ToString());
                     return true;
                 });
             }
 
             void SetButtonContent(string s)
                 => Application.Current.Dispatcher.Invoke(() => razer_wrapper_install_button.Content = s);
 
-            void ShowMessageBox(string message, string title)
-                => Application.Current.Dispatcher.Invoke(() => System.Windows.MessageBox.Show(message, title, MessageBoxButton.OK, MessageBoxImage.Exclamation));
+            void ShowMessageBox(string message, string title, MessageBoxImage image = MessageBoxImage.Exclamation)
+                => Application.Current.Dispatcher.Invoke(() => System.Windows.MessageBox.Show(message, title, MessageBoxButton.OK, image));
 
             razer_wrapper_install_button.IsEnabled = false;
             razer_wrapper_uninstall_button.IsEnabled = false;
@@ -833,19 +832,18 @@ private void razer_wrapper_uninstall_button_Click(object sender, RoutedEventArgs
         {
             void HandleExceptions(AggregateException ae)
             {
+                ShowMessageBox(ae.ToString(), "Exception!", MessageBoxImage.Error);
                 ae.Handle(ex => {
-                    Application.Current.Dispatcher.Invoke(() =>
-                            System.Windows.MessageBox.Show(ex.ToString(), "Exception!",
-                                                        MessageBoxButton.OK, MessageBoxImage.Error));
+                    Global.logger.Error(ex.ToString());
                     return true;
                 });
             }
 
             void SetButtonContent(string s)
                 => Application.Current.Dispatcher.Invoke(() => razer_wrapper_uninstall_button.Content = s);
-
-            void ShowMessageBox(string message, string title)
-                => Application.Current.Dispatcher.Invoke(() => System.Windows.MessageBox.Show(message, title, MessageBoxButton.OK, MessageBoxImage.Exclamation));
+            
+            void ShowMessageBox(string message, string title, MessageBoxImage image = MessageBoxImage.Exclamation)
+                => Application.Current.Dispatcher.Invoke(() => System.Windows.MessageBox.Show(message, title, MessageBoxButton.OK, image));
 
             razer_wrapper_install_button.IsEnabled = false;
             razer_wrapper_uninstall_button.IsEnabled = false;