From d1bce64c343d78f4ca06406be784ac3669629708 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 15 Mar 2017 20:23:04 +0300
Subject: fixes #753 (broken tabs dragging)

---
 plugins/TabSRMM/src/container.cpp | 5 +++--
 plugins/TabSRMM/src/tabctrl.cpp   | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 3a86d7910c..da83b48369 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -43,11 +43,12 @@ static bool fForceOverlayIcons = false;
 
 void TContainerData::UpdateTabs()
 {
-	int nTabs = TabCtrl_GetItemCount(hwnd);
+	HWND hwndTab = GetDlgItem(hwnd, IDC_MSGTABS);
+	int nTabs = TabCtrl_GetItemCount(hwndTab);
 	for (int i = 0; i < nTabs; i++) {
 		TCITEM tci;
 		tci.mask = TCIF_PARAM;
-		if (!TabCtrl_GetItem(hwnd, i, &tci))
+		if (!TabCtrl_GetItem(hwndTab, i, &tci))
 			continue;
 
 		CTabBaseDlg *dat = (CTabBaseDlg*)GetWindowLongPtr((HWND)tci.lParam, GWLP_USERDATA);
diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp
index 253ff90468..b4d1b6947f 100644
--- a/plugins/TabSRMM/src/tabctrl.cpp
+++ b/plugins/TabSRMM/src/tabctrl.cpp
@@ -1111,11 +1111,9 @@ static LRESULT CALLBACK TabControlSubclassProc(HWND hwnd, UINT msg, WPARAM wPara
 				int i = GetTabItemFromMouse(hwnd, &pt);
 				if (i != -1) {
 					TCITEM tc;
-					CSrmmWindow *dat = nullptr;
-
 					tc.mask = TCIF_PARAM;
 					TabCtrl_GetItem(hwnd, i, &tc);
-					dat = (CSrmmWindow*)GetWindowLongPtr((HWND)tc.lParam, GWLP_USERDATA);
+					CSrmmWindow *dat = (CSrmmWindow*)GetWindowLongPtr((HWND)tc.lParam, GWLP_USERDATA);
 					if (dat) {
 						tabdat->bDragging = TRUE;
 						tabdat->iBeginIndex = i;
-- 
cgit v1.2.3