diff options
| -rw-r--r-- | plugins/TabSRMM/src/msgs.cpp | 3 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/userprefs.cpp | 3 | ||||
| -rw-r--r-- | src/core/stdmsg/src/globals.cpp | 7 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 28bd1946af..457ce4b621 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -145,8 +145,7 @@ INT_PTR SendMessageCommand_Worker(MCONTACT hContact, LPCSTR pszMsg, bool isWchar if (0 == (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND))
return 0;
- auto *pDlg = Srmm_FindDialog(hContact);
- if (pDlg) {
+ if (auto *pDlg = Srmm_FindDialog(hContact)) {
if (pszMsg) {
HWND hEdit = GetDlgItem(pDlg->GetHwnd(), IDC_SRMM_MESSAGE);
SendMessage(hEdit, EM_SETSEL, -1, GetWindowTextLength(hEdit));
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp index 880112e041..b6304c3114 100644 --- a/plugins/TabSRMM/src/userprefs.cpp +++ b/plugins/TabSRMM/src/userprefs.cpp @@ -339,8 +339,7 @@ public: bool OnApply() override
{
- CMsgDialog *dat = Srmm_FindDialog(m_hContact);
- if (dat) {
+ if (auto *dat = Srmm_FindDialog(m_hContact)) {
uint32_t dwOldFlags = (dat->m_dwFlags & MWF_LOG_ALL);
dat->SetDialogToType();
dat->LoadLocalFlags();
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 76c1cf5a2b..21a6f8e752 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -40,11 +40,10 @@ static int OnShutdown(WPARAM, LPARAM) static int OnMetaChanged(WPARAM hMeta, LPARAM)
{
- if (hMeta) {
- auto *pDlg = Srmm_FindDialog(hMeta);
- if (pDlg != nullptr)
+ if (hMeta)
+ if (auto *pDlg = Srmm_FindDialog(hMeta))
pDlg->UpdateAvatar();
- }
+
return 0;
}
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index eab4269b80..0e9287aca7 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -236,8 +236,7 @@ static int MessageSettingChanged(WPARAM hContact, LPARAM lParam) // If a contact gets deleted, close its message window if there is any
static int ContactDeleted(WPARAM hContact, LPARAM)
{
- auto *pDlg = Srmm_FindDialog(hContact);
- if (pDlg)
+ if (auto *pDlg = Srmm_FindDialog(hContact))
pDlg->CloseTab();
return 0;
|