From efea97930e985de136a600d692bda877cc2d2fef Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 18 Sep 2019 14:46:24 +0300
Subject: final fix for #2068

---
 plugins/TabSRMM/src/stdafx.h    |  1 -
 plugins/TabSRMM/src/taskbar.cpp | 13 ++++++-------
 plugins/TabSRMM/src/taskbar.h   |  1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 9b451112b5..8aef3fe071 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -47,7 +47,6 @@
 
 #include <msapi/vsstyle.h>
 #include <msapi/comptr.h>
-#include <msapi/hwbrk.h>
 
 #include <m_avatars.h>
 #include <m_message.h>
diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index f4d2935761..6def0b6f2f 100644
--- a/plugins/TabSRMM/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
@@ -191,8 +191,6 @@ void CMsgDialog::VerifyProxy()
 CProxyWindow::CProxyWindow(CMsgDialog *dat) :
 	m_dat(dat)
 {
-	m_hBreakPoint = ::SetHardwareBreakpoint(GetCurrentThread(), HWBRK_TYPE_WRITE, HWBRK_SIZE_4, &m_dat);
-
 	m_hwndProxy = ::CreateWindowEx(/*WS_EX_TOOLWINDOW | */WS_EX_NOACTIVATE, PROXYCLASSNAME, L"",
 		WS_POPUP | WS_BORDER | WS_SYSMENU | WS_CAPTION, -32000, -32000, 10, 10, nullptr, nullptr, g_plugin.getInst(), (LPVOID)this);
 
@@ -210,7 +208,6 @@ CProxyWindow::~CProxyWindow()
 {
 	Win7Taskbar->unRegisterTab(m_hwndProxy);
 	::DestroyWindow(m_hwndProxy);
-	::RemoveHardwareBreakpoint(m_hBreakPoint);
 
 	delete m_thumb;
 }
@@ -485,11 +482,13 @@ LRESULT CALLBACK CProxyWindow::wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA
 {
 	switch (msg) {
 	case WM_CLOSE:
-		SendMessage(m_dat->GetHwnd(), WM_CLOSE, 1, 2);
 		{
-			TContainerData *pC = m_dat->m_pContainer;
-			if (!IsIconic(pC->m_hwnd))
-				SetForegroundWindow(pC->m_hwnd);
+			HWND hwndCont = m_dat->m_pContainer->m_hwnd;
+
+			SendMessage(m_dat->GetHwnd(), WM_CLOSE, 1, 2);
+
+			if (!IsIconic(hwndCont))
+				SetForegroundWindow(hwndCont);
 		}
 		return 0;
 
diff --git a/plugins/TabSRMM/src/taskbar.h b/plugins/TabSRMM/src/taskbar.h
index 4d8fa4802f..31209e45d8 100644
--- a/plugins/TabSRMM/src/taskbar.h
+++ b/plugins/TabSRMM/src/taskbar.h
@@ -102,7 +102,6 @@ class CProxyWindow : public MZeroedObject
 	HWND m_hwndProxy;
 	LONG m_width, m_height;
 	HICON m_hBigIcon, m_hOverlayIcon;
-	HANDLE m_hBreakPoint;
 
 	LRESULT CALLBACK wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-- 
cgit v1.2.3