Fix ManualOcrOverlay being activated multiple times

hlysine · Feb 25, 2022 · a87d27c · a87d27c
1 parent c488cca
commit a87d27c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/QuickDictionary/UserInterface/MainWindow.xaml.cs b/QuickDictionary/UserInterface/MainWindow.xaml.cs
@@ -249,6 +249,7 @@ private async void AutoOcrTimer_Tick(object sender, EventArgs e)
     }
 
     private Bitmap screenshot;
+    private ManualOcrOverlay manualOcrOverlay;
 
     private async void startOcr()
     {
@@ -259,8 +260,11 @@ private async void startOcr()
             return;
         }
 
-        var overlay = new ManualOcrOverlay();
-        overlay.WordSelected += Overlay_WordSelected;
+        if (manualOcrOverlay is { IsLoaded: true })
+            return;
+
+        manualOcrOverlay = new ManualOcrOverlay();
+        manualOcrOverlay.WordSelected += Overlay_WordSelected;
         screenshot = ScreenCapture.GetScreenshot();
         await Task.Run(() =>
         {
@@ -276,12 +280,12 @@ await Task.Run(() =>
                 bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
                 bitmapImage.StreamSource = ms;
                 bitmapImage.EndInit();
-                overlay.SetBg(bitmapImage);
+                manualOcrOverlay.SetBackground(bitmapImage);
                 ms.Dispose();
             });
         });
         Dispatcher.Invoke(() => progressLoading.Visibility = Visibility.Visible);
-        overlay.ShowDialog();
+        manualOcrOverlay.ShowDialog();
     }
 
     private void unminimize()
@@ -301,7 +305,7 @@ private async void KeyHook_KeyPressed(object sender, KeyPressedEventArgs e)
             txtWord.Focus();
             txtWord.SelectAll();
         }
-        else
+        else if (e.Key == Keys.G)
         {
             if (AutoOcr)
             {

diff --git a/QuickDictionary/UserInterface/Ocr/ManualOcrOverlay.xaml.cs b/QuickDictionary/UserInterface/Ocr/ManualOcrOverlay.xaml.cs
@@ -28,7 +28,7 @@ public ManualOcrOverlay()
         InitializeComponent();
     }
 
-    public void SetBg(BitmapImage img)
+    public void SetBackground(BitmapImage img)
     {
         Dispatcher.Invoke(() =>
         {