From 6c75142f5e14c3aef94474f9bea2f208f6a2c80b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 8 May 2024 21:58:24 +0300
Subject: =?UTF-8?q?fixes=20#2870=20(Tipper:=20=D0=BF=D1=80=D0=B8=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5=20=D0=9C=D0=B8=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=8B=20=D0=BF=D0=BE=D0=B4=20=D0=BA=D1=83=D1=80?=
 =?UTF-8?q?=D1=81=D0=BE=D1=80=D0=BE=D0=BC=20=D0=B2=D0=BE=D0=B7=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B5=D1=82=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BA=D0=B0,=20=D1=81=D0=BB=D0=BE=D0=B2=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BA=D1=83=D1=80=D1=81=D0=BE=D1=80=20=D0=BD=D0=B0=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=20=D0=BD=D0=B0=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=B2=20=D1=82=D1=80=D0=B5=D0=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/clisttray.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp
index db28de042a..2ca5bef375 100644
--- a/src/mir_app/src/clisttray.cpp
+++ b/src/mir_app/src/clisttray.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 ITaskbarList3* pTaskbarInterface;
 
+static bool bIgnoreCallback = false;
 static UINT WM_TASKBARCREATED;
 static UINT WM_TASKBARBUTTONCREATED;
 static UINT_PTR RefreshTimerId = 0;
@@ -63,7 +64,9 @@ static HICON lastTaskBarIcon;
 static void SetTaskBarIcon(const HICON hIcon, const wchar_t *szNewTip)
 {
 	if (pTaskbarInterface) {
+		bIgnoreCallback = true;
 		pTaskbarInterface->SetOverlayIcon(g_clistApi.hwndContactList, hIcon, szNewTip);
+		bIgnoreCallback = false;
 		lastTaskBarIcon = hIcon;
 	}
 }
@@ -670,6 +673,9 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 		break;
 
 	case TIM_CALLBACK:
+		if (bIgnoreCallback)
+			break;
+
 		if (msg->lParam == WM_RBUTTONDOWN || msg->lParam == WM_LBUTTONDOWN || msg->lParam == WM_RBUTTONDOWN && g_trayTooltipActive) {
 			Tipper_Hide();
 			g_trayTooltipActive = false;
-- 
cgit v1.2.3