diff options
| author | George Hazan <ghazan@miranda.im> | 2018-06-05 11:47:37 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-06-05 11:47:37 +0300 |
| commit | 11b0f497c9a7d13ea7caba9841d661f72389751c (patch) | |
| tree | 40c9d116272d6a4c63a717cd68686a61e6e5c989 /plugins/TabSRMM/src/msgs.cpp | |
| parent | 9ff6f169d1e2bd5bc139290d4abd6d7573fa6061 (diff) | |
merge of SRMM related changes into stable
Diffstat (limited to 'plugins/TabSRMM/src/msgs.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/msgs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 3d3c676de8..3e3525f856 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -160,7 +160,7 @@ INT_PTR CTabBaseDlg::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) case DM_SETLOCALE:
if (m_dwFlags & MWF_WASBACKGROUNDCREATE)
break;
- if (m_pContainer->m_hwndActive == m_hwnd && PluginConfig.m_bAutoLocaleSupport && m_pContainer->m_hwnd == GetForegroundWindow() && m_pContainer->m_hwnd == GetActiveWindow()) {
+ if (PluginConfig.m_bAutoLocaleSupport && IsActive()) {
if (lParam)
m_hkl = (HKL)lParam;
@@ -355,7 +355,7 @@ int TSAPI MessageWindowOpened(MCONTACT hContact, HWND _hwnd) return 0;
}
if (pContainer->dwFlags & CNT_DONTREPORTUNFOCUSED) {
- if (!IsIconic(pContainer->m_hwnd) && GetForegroundWindow() != pContainer->m_hwnd && GetActiveWindow() != pContainer->m_hwnd)
+ if (!IsIconic(pContainer->m_hwnd) && !pContainer->IsActive())
return 0;
}
if (pContainer->dwFlags & CNT_ALWAYSREPORTINACTIVE) {
|