Minor

rampaa · Oct 8, 2024 · 48611e8 · 48611e8
1 parent 9fd6749
commit 48611e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/JL.Windows/GUI/PopupWindow.xaml.cs b/JL.Windows/GUI/PopupWindow.xaml.cs
@@ -1194,6 +1194,8 @@ private async void PrimarySpelling_PreviewMouseUp(object sender, MouseButtonEven
         if (e.ChangedButton == ConfigManager.CopyPrimarySpellingToClipboardMouseButton)
         {
             WindowsUtils.CopyTextToClipboard(((TextBlock)sender).Text);
+            HidePopup();
+            return;
         }
 
         if (!MiningMode || e.ChangedButton != ConfigManager.MineMouseButton)

diff --git a/JL.Windows/Utilities/WindowsUtils.cs b/JL.Windows/Utilities/WindowsUtils.cs
@@ -616,6 +616,13 @@ public static void CopyTextToClipboard(string? text)
             return;
         }
 
+        bool captureTextFromClipboard = CoreConfigManager.CaptureTextFromClipboard;
+        CoreConfigManager.CaptureTextFromClipboard = false;
+        if (captureTextFromClipboard)
+        {
+            WinApi.UnsubscribeFromClipboardChanged(MainWindow.Instance.WindowHandle);
+        }
+
         bool retry = true;
         do
         {
@@ -631,6 +638,12 @@ public static void CopyTextToClipboard(string? text)
                 Utils.Logger.Warning(ex, "CopyTextToClipboard failed");
             }
         } while (retry);
+
+        CoreConfigManager.CaptureTextFromClipboard = captureTextFromClipboard;
+        if (captureTextFromClipboard)
+        {
+            WinApi.SubscribeToClipboardChanged(MainWindow.Instance.WindowHandle);
+        }
     }
 
     public static void HandlePostCopy(string text, string? subsequentText)