From d70487f05a8306aae3adf6325724c710f89b2883 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 8 Apr 2020 19:00:16 +0300
Subject: fixes #2314 (StdMsg: Focus doesn't follow tab switching)

---
 src/core/stdmsg/src/msgdialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index c1bc480784..20835dfe21 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -331,6 +331,8 @@ void CMsgDialog::OnActivate()
 		UpdateLastMessage();
 		FixTabIcons();
 	}
+	
+	SetFocus(m_message.GetHwnd());
 }
 
 void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
@@ -921,7 +923,6 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		if (LOWORD(wParam) != WA_ACTIVE)
 			break;
 
-		SetFocus(m_message.GetHwnd());
 		__fallthrough;
 
 	case WM_MOUSEACTIVATE:
-- 
cgit v1.2.3