From 3e1fc76bfe7e8d56f12154c9d4ec568e1e714a93 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Wed, 27 Apr 2022 22:03:05 +0200
Subject: [PATCH] Profile editor - Fix closing brush/effect config dialogs

---
 src/.idea/.idea.Artemis/.idea/avalonia.xml             |  1 +
 .../Windows/BrushConfigurationWindowView.axaml.cs      |  9 ++++++---
 .../Windows/BrushConfigurationWindowViewModel.cs       | 10 ++++++----
 .../Windows/EffectConfigurationWindowView.axaml.cs     |  7 +++++--
 .../Windows/EffectConfigurationWindowViewModel.cs      | 10 ++++++----
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/.idea/.idea.Artemis/.idea/avalonia.xml b/src/.idea/.idea.Artemis/.idea/avalonia.xml
index 248ae2e68..33b62dcac 100644
--- a/src/.idea/.idea.Artemis/.idea/avalonia.xml
+++ b/src/.idea/.idea.Artemis/.idea/avalonia.xml
@@ -24,6 +24,7 @@
         <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/SidebarCategoryEditView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
         <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml" value="Artemis.UI.Windows/Artemis.UI.Windows.csproj" />
         <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
+        <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
         <entry key="Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
         <entry key="Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
         <entry key="Avalonia/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml" value="Avalonia/Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
index 42011416c..3016b7d79 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows;
 
-public class BrushConfigurationWindowView : ReactiveCoreWindow<EffectConfigurationWindowViewModel>
+public class BrushConfigurationWindowView : ReactiveCoreWindow<BrushConfigurationWindowViewModel>
 {
     public BrushConfigurationWindowView()
     {
@@ -20,8 +20,11 @@ public class BrushConfigurationWindowView : ReactiveCoreWindow<EffectConfigurati
         Closing += OnClosing;
     }
 
-    private void OnClosing(object? sender, CancelEventArgs e)
+    private async void OnClosing(object? sender, CancelEventArgs e)
     {
-        e.Cancel = ViewModel?.CanClose() ?? true;
+        if (ViewModel == null)
+            return;
+
+        e.Cancel = !await ViewModel.CanClose();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
index f8a7a8383..55bce2cd3 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.LayerBrushes;
 using Avalonia.Threading;
@@ -18,14 +19,15 @@ public class BrushConfigurationWindowViewModel : DialogViewModelBase<object?>
     public BrushConfigurationViewModel ConfigurationViewModel { get; }
     public LayerBrushConfigurationDialog Configuration { get; }
 
-    public bool CanClose()
+    public async Task<bool> CanClose()
     {
-        return ConfigurationViewModel.CanClose() && Dispatcher.UIThread.InvokeAsync(async () => await ConfigurationViewModel.CanCloseAsync()).GetAwaiter().GetResult();
+        // ReSharper disable once MethodHasAsyncOverload - Checking both in case the plugin developer only implemented CanClose
+        return ConfigurationViewModel.CanClose() && await ConfigurationViewModel.CanCloseAsync();
     }
 
-    private void ConfigurationViewModelOnCloseRequested(object? sender, EventArgs e)
+    private async void ConfigurationViewModelOnCloseRequested(object? sender, EventArgs e)
     {
-        if (CanClose())
+        if (await CanClose())
             Close(null);
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
index 8f1683152..eb1fbc70f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
@@ -20,8 +20,11 @@ public class EffectConfigurationWindowView : ReactiveCoreWindow<EffectConfigurat
         Closing += OnClosing;
     }
 
-    private void OnClosing(object? sender, CancelEventArgs e)
+    private async void OnClosing(object? sender, CancelEventArgs e)
     {
-        e.Cancel = ViewModel?.CanClose() ?? true;
+        if (ViewModel == null)
+            return;
+
+        e.Cancel = !await ViewModel.CanClose();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
index 979cab5c1..fa2b55aaa 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.LayerEffects;
 using Avalonia.Threading;
@@ -18,14 +19,15 @@ public class EffectConfigurationWindowViewModel : DialogViewModelBase<object?>
     public EffectConfigurationViewModel ConfigurationViewModel { get; }
     public LayerEffectConfigurationDialog Configuration { get; }
 
-    public bool CanClose()
+    public async Task<bool> CanClose()
     {
-        return ConfigurationViewModel.CanClose() && Dispatcher.UIThread.InvokeAsync(async () => await ConfigurationViewModel.CanCloseAsync()).GetAwaiter().GetResult();
+        // ReSharper disable once MethodHasAsyncOverload - Checking both in case the plugin developer only implemented CanClose
+        return ConfigurationViewModel.CanClose() && await ConfigurationViewModel.CanCloseAsync();
     }
 
-    private void ConfigurationViewModelOnCloseRequested(object? sender, EventArgs e)
+    private async void ConfigurationViewModelOnCloseRequested(object? sender, EventArgs e)
     {
-        if (CanClose())
+        if (await CanClose())
             Close(null);
     }
 }
\ No newline at end of file