From a6f2b5fb358392a227e16566e4ad39832d74bb89 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 1 Mar 2017 23:11:32 +0300
Subject: fix for a problem with activating new tabs in tabSRMM

---
 plugins/TabSRMM/src/chat/services.cpp | 2 +-
 plugins/TabSRMM/src/msgs.cpp          | 2 +-
 src/mir_core/src/ui_utils.cpp         | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index c5735a6a8d..7f574eb381 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -102,7 +102,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 
 	CChatRoomDlg *pDlg = new CChatRoomDlg(&newData);
 	pDlg->SetParent(GetDlgItem(pContainer->hwnd, IDC_MSGTABS));
-	pDlg->Show();
+	pDlg->Create();
 
 	HWND hwndNew = pDlg->GetHwnd();
 	if (pContainer->dwFlags & CNT_SIDEBAR) {
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 342cdadeb1..a77bcde709 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -569,7 +569,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	
 	CSrmmWindow *pWindow = new CSrmmWindow(&newData);
 	pWindow->SetParent(hwndTab);
-	pWindow->Show();
+	pWindow->Create();
 	HWND hwndNew = pWindow->GetHwnd();
 
 	// switchbar support
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index 6231170c30..89a5ba09e8 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -73,12 +73,13 @@ CDlgBase::~CDlgBase()
 
 void CDlgBase::Create()
 {
-	ShowWindow(CreateDialogParam(m_hInst, MAKEINTRESOURCE(m_idDialog), m_hwndParent, GlobalDlgProc, (LPARAM)this), SW_HIDE);
+	CreateDialogParam(m_hInst, MAKEINTRESOURCE(m_idDialog), m_hwndParent, GlobalDlgProc, (LPARAM)this);
 }
 
 void CDlgBase::Show(int nCmdShow)
 {
-	ShowWindow(CreateDialogParam(m_hInst, MAKEINTRESOURCE(m_idDialog), m_hwndParent, GlobalDlgProc, (LPARAM)this), nCmdShow);
+	Create();
+	ShowWindow(m_hwnd, nCmdShow);
 }
 
 int CDlgBase::DoModal()
-- 
cgit v1.2.3