From 46425ea8d084497a7b29ed9b7a57188732726406 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 24 Aug 2017 23:25:31 +0300 Subject: nullptr must be passed inside SetStatusText to return back to the predefined value --- src/core/stdmsg/src/msgdialog.cpp | 2 +- src/mir_app/src/srmm_util.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3