Minor

rampaa · Oct 9, 2024 · 93c33f3 · 93c33f3
1 parent 4f2aa6a
commit 93c33f3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/JL.Core/Frontend/DummyFrontend.cs b/JL.Core/Frontend/DummyFrontend.cs
@@ -26,7 +26,7 @@ public void ApplyDictOptions()
 
     public Task CopyFromWebSocket(string text) => Task.CompletedTask;
 
-    public byte[]? GetImageFromClipboardAsByteArray() => null;
+    public Task<byte[]?> GetImageFromClipboardAsByteArray() => new(() => null);
 
     public Task TextToSpeech(string voiceName, string text) => Task.CompletedTask;
 

diff --git a/JL.Core/Frontend/IFrontend.cs b/JL.Core/Frontend/IFrontend.cs
@@ -18,7 +18,7 @@ public interface IFrontend
 
     public void ApplyDictOptions();
 
-    public byte[]? GetImageFromClipboardAsByteArray();
+    public Task<byte[]?> GetImageFromClipboardAsByteArray();
 
     public Task TextToSpeech(string voiceName, string text);
 

diff --git a/JL.Core/Mining/MiningUtils.cs b/JL.Core/Mining/MiningUtils.cs
@@ -508,7 +508,7 @@ public static async Task Mine(LookupResult lookupResult, string currentText, str
         List<string> imageFields = FindFields(JLField.Image, userFields);
         bool needsImage = imageFields.Count > 0;
         byte[]? imageBytes = needsImage
-            ? Utils.Frontend.GetImageFromClipboardAsByteArray()
+            ? await Utils.Frontend.GetImageFromClipboardAsByteArray().ConfigureAwait(false)
             : null;
 
         if (imageBytes is not null)

diff --git a/JL.Windows/Utilities/WindowsUtils.cs b/JL.Windows/Utilities/WindowsUtils.cs
@@ -722,16 +722,15 @@ public static void ChangeTheme(SkinType skin)
         });
     }
 
-    public static byte[]? GetImageFromClipboardAsByteArray()
+    public static Task<byte[]?> GetImageFromClipboardAsByteArray()
     {
-        return Application.Current.Dispatcher.Invoke(static () =>
+        return Application.Current.Dispatcher.Invoke(static async () =>
         {
             while (Clipboard.ContainsImage())
             {
                 try
                 {
                     BitmapSource? image = Clipboard.GetImage();
-
                     if (image is null)
                     {
                         return null;
@@ -747,6 +746,7 @@ public static void ChangeTheme(SkinType skin)
                 catch (Exception ex)
                 {
                     Utils.Logger.Warning(ex, "GetImageFromClipboard failed");
+                    await Task.Delay(5).ConfigureAwait(true);
                 }
             }
 

diff --git a/JL.Windows/WindowsFrontend.cs b/JL.Windows/WindowsFrontend.cs
@@ -27,7 +27,7 @@ public void ShowOkDialog(string text, string caption)
 
     public Task CopyFromWebSocket(string text) => MainWindow.Instance.CopyFromWebSocket(text);
 
-    public byte[]? GetImageFromClipboardAsByteArray() => WindowsUtils.GetImageFromClipboardAsByteArray();
+    public Task<byte[]?> GetImageFromClipboardAsByteArray() => WindowsUtils.GetImageFromClipboardAsByteArray();
 
     public Task TextToSpeech(string voiceName, string text) => SpeechSynthesisUtils.TextToSpeech(voiceName, text);