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 /src/mir_app | |
| parent | 9ff6f169d1e2bd5bc139290d4abd6d7573fa6061 (diff) | |
merge of SRMM related changes into stable
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_tools.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_opts.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index 71d0a830ea..4da02f7426 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -284,7 +284,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight if (!gce || !si || gce->bIsMe || si->iType == GCW_SERVER)
return FALSE;
- BOOL bInactive = si->pDlg == nullptr || !ContainsWindow(GetForegroundWindow(), si->pDlg->GetHwnd());
+ BOOL bInactive = si->pDlg == nullptr || !si->pDlg->IsActive();
int iEvent = gce->iType;
diff --git a/src/mir_app/src/proto_opts.cpp b/src/mir_app/src/proto_opts.cpp index 884577650e..f09febbc07 100644 --- a/src/mir_app/src/proto_opts.cpp +++ b/src/mir_app/src/proto_opts.cpp @@ -622,10 +622,8 @@ public: int idx = m_accList.GetCurSel();
if (idx != -1) {
PROTOACCOUNT *pa = (PROTOACCOUNT*)m_accList.GetItemData(idx);
- if (pa) {
+ if (pa)
pa->bAccMgrUIChanged = true;
- NotifyChange();
- }
}
}
};
|