From 16b12b8d237e06f6c77e73504db3fa5119ce77c7 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sun, 14 Jan 2024 17:40:57 +0300
Subject: [PATCH] Check is window active

---
 ShareX.HelpersLib/Native/NativeMethods_Helpers.cs | 11 -----------
 ShareX/CaptureHelpers/CaptureWindow.cs            |  9 ++++++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
index 37f129ee2..ee3225098 100644
--- a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
+++ b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
@@ -28,7 +28,6 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;
 using System.Windows.Forms;
 
 namespace ShareX.HelpersLib
@@ -290,16 +289,6 @@ public static Rectangle MaximizedWindowFix(IntPtr handle, Rectangle windowRect)
             return windowRect;
         }
 
-        public static void ActivateWindowRepeat(IntPtr handle, int count)
-        {
-            for (int i = 0; GetForegroundWindow() != handle && i < count; i++)
-            {
-                BringWindowToTop(handle);
-                Thread.Sleep(1);
-                Application.DoEvents();
-            }
-        }
-
         public static Rectangle GetTaskbarRectangle()
         {
             APPBARDATA abd = APPBARDATA.NewAPPBARDATA();
diff --git a/ShareX/CaptureHelpers/CaptureWindow.cs b/ShareX/CaptureHelpers/CaptureWindow.cs
index 418eae6db..d765d8be5 100644
--- a/ShareX/CaptureHelpers/CaptureWindow.cs
+++ b/ShareX/CaptureHelpers/CaptureWindow.cs
@@ -51,11 +51,14 @@ protected override TaskMetadata Execute(TaskSettings taskSettings)
             if (windowInfo.IsMinimized)
             {
                 windowInfo.Restore();
+                Thread.Sleep(250);
             }
 
-            windowInfo.Activate();
-
-            Thread.Sleep(250);
+            if (!windowInfo.IsActive)
+            {
+                windowInfo.Activate();
+                Thread.Sleep(100);
+            }
 
             TaskMetadata metadata = new TaskMetadata();
             metadata.UpdateInfo(windowInfo);