Fixed dispatch issues during activation (#79)

Richasy · Sep 28, 2023 · 491f18a · 491f18a
1 parent 1d956d2
commit 491f18a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
@@ -66,7 +66,7 @@ public void ActivateWindow(AppActivationArguments arguments = default)
             {
                 LaunchWindow();
             }
-            else if (_window.Visible && HandleCloseEvents && arguments.Data != null)
+            else if (_window.Visible && HandleCloseEvents && arguments?.Data == null)
             {
                 _window.Hide();
             }
@@ -76,9 +76,15 @@ public void ActivateWindow(AppActivationArguments arguments = default)
                 PInvoke.SetForegroundWindow(new HWND(WindowNative.GetWindowHandle(_window)));
             }
 
-            if (arguments?.Data is IActivatedEventArgs args)
+            try
+            {
+                if (arguments?.Data is IActivatedEventArgs args)
+                {
+                    MainWindow.Instance.ActivateArgumentsAsync(args);
+                }
+            }
+            catch (Exception)
             {
-                MainWindow.Instance.ActivateArgumentsAsync(args);
             }
         });
     }