From acaea8d0a8a6208181f90d33f31a0270089017b6 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 8 May 2018 20:05:34 +0200
Subject: fixes #1325 (StdMsg plugin doesn't change input focus on tabs switch)

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

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 59f3cdb76f..0a5ef46008 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1084,9 +1084,10 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		if (LOWORD(wParam) != WA_ACTIVE)
 			break;
 
-		SetFocus(m_message.GetHwnd());
-		// fall through
+		__fallthrough;
+
 	case WM_MOUSEACTIVATE:
+		SetFocus(m_message.GetHwnd());
 		UpdateTitle();
 		UpdateLastMessage();
 		if (KillTimer(m_hwnd, TIMERID_FLASHWND))
-- 
cgit v1.2.3