From 1e204da223991549a9204cb7d61da7042c2bbb70 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Wed, 23 Mar 2016 22:50:28 +0100
Subject: Windows: Don't use the foreground setting code if the window is
 already foreground

---
 src/Common/Dlgcode.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index da37795d..24f93559 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -6954,22 +6954,25 @@ void BringToForeground(HWND hWnd)
 	DWORD dwThisTID = ::GetCurrentThreadId(),
 	      dwCurrTID = ::GetWindowThreadProcessId(hCurrWnd,0);
  
-	if(dwThisTID != dwCurrTID)
+	if (hCurrWnd != hWnd)
 	{
-		::AttachThreadInput(dwThisTID, dwCurrTID, TRUE);
- 
-		::SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT,0,&lockTimeOut,0);
-		::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,0,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE);
- 
-		::AllowSetForegroundWindow(ASFW_ANY);
-	}
- 
-	::SetForegroundWindow(hWnd);
- 
-	if(dwThisTID != dwCurrTID)
-	{
-		::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,(PVOID)lockTimeOut,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE);
-		::AttachThreadInput(dwThisTID, dwCurrTID, FALSE);
+		if(dwThisTID != dwCurrTID)
+		{
+			::AttachThreadInput(dwThisTID, dwCurrTID, TRUE);
+	 
+			::SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT,0,&lockTimeOut,0);
+			::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,0,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE);
+	 
+			::AllowSetForegroundWindow(ASFW_ANY);
+		}
+	 
+		::SetForegroundWindow(hWnd);
+	 
+		if(dwThisTID != dwCurrTID)
+		{
+			::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,(PVOID)lockTimeOut,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE);
+			::AttachThreadInput(dwThisTID, dwCurrTID, FALSE);
+		}
 	}
 
 #ifdef TCMOUNT
-- 
cgit v1.2.3