From 74f99b4e59fd0a8efd42748f86e752b85ab81024 Mon Sep 17 00:00:00 2001
From: Mark Cilia Vincenti <markciliavincenti@gmail.com>
Date: Sun, 21 Apr 2024 17:32:57 +0200
Subject: [PATCH] Switched from SemaphoreSlim lock to AsyncNonKeyedLocker
 (#1184)

---
 .../DiscordChatExporter.Core.csproj                   |  4 ++--
 .../ViewModels/Framework/DialogManager.cs             | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
index 709517fa..8c2b575b 100644
--- a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
+++ b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="6.2.4" />
+    <PackageReference Include="AsyncKeyedLock" Version="6.3.4" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
@@ -12,4 +12,4 @@
     <PackageReference Include="YoutubeExplode" Version="6.3.10" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs b/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
index 15958817..1c9fb073 100644
--- a/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
+using AsyncKeyedLock;
 using MaterialDesignThemes.Wpf;
 using Microsoft.Win32;
 using Stylet;
@@ -10,7 +10,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework;
 
 public class DialogManager(IViewManager viewManager) : IDisposable
 {
-    private readonly SemaphoreSlim _dialogLock = new(1, 1);
+    private readonly AsyncNonKeyedLocker _dialogLock = new();
 
     public async ValueTask<T?> ShowDialogAsync<T>(DialogScreen<T> dialogScreen)
     {
@@ -34,16 +34,11 @@ public class DialogManager(IViewManager viewManager) : IDisposable
             dialogScreen.Closed += OnScreenClosed;
         }
 
-        await _dialogLock.WaitAsync();
-        try
+        using (await _dialogLock.LockAsync())
         {
             await DialogHost.Show(view, OnDialogOpened);
             return dialogScreen.DialogResult;
         }
-        finally
-        {
-            _dialogLock.Release();
-        }
     }
 
     public string? PromptSaveFilePath(string filter = "All files|*.*", string defaultFilePath = "")