diff options
| author | George Hazan <ghazan@miranda.im> | 2017-08-24 23:25:31 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-08-24 23:25:31 +0300 |
| commit | 46425ea8d084497a7b29ed9b7a57188732726406 (patch) | |
| tree | 72d542cb2939ce4908f9b51e9b6912c3a57e32f3 | |
| parent | 8c1471451343d0323f2cd0b3cdf7557eeea693ee (diff) | |
nullptr must be passed inside SetStatusText to return back to the predefined value
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_util.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 8f583564b2..d7a2e05b74 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -289,7 +289,7 @@ void CScriverWindow::SetStatusText(const wchar_t *wszText, HICON hIcon) ParentWindowData *pDat = m_pParent;
if (pDat != nullptr) {
SendMessage(pDat->hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
- SendMessage(pDat->hwndStatus, SB_SETTEXT, 0, (LPARAM)wszText);
+ SendMessage(pDat->hwndStatus, SB_SETTEXT, 0, (LPARAM)(wszText == nullptr ? L"" : wszText));
}
}
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 7646c4e7ed..e1678665d8 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -564,7 +564,7 @@ void CSrmmWindow::SetupStatusBar() void CSrmmWindow::SetStatusText(const wchar_t *wszText, HICON hIcon)
{
SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
- SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)wszText);
+ SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)(wszText == nullptr ? L"" : wszText));
}
void CSrmmWindow::UpdateReadChars()
diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp index f9e7ed65c5..45552db1d2 100644 --- a/src/mir_app/src/srmm_util.cpp +++ b/src/mir_app/src/srmm_util.cpp @@ -105,7 +105,7 @@ static INT_PTR CALLBACK sttSetStatusText(void *_p) CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(param->hwnd, GWLP_USERDATA); if (pDlg != nullptr) - pDlg->SetStatusText((param->wszText == nullptr) ? L"" : param->wszText, param->hIcon); + pDlg->SetStatusText(param->wszText, param->hIcon); return 0; } |