From 46425ea8d084497a7b29ed9b7a57188732726406 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 24 Aug 2017 23:25:31 +0300
Subject: nullptr must be passed inside SetStatusText to return back to the
 predefined value

---
 plugins/Scriver/src/msgs.cpp      | 2 +-
 src/core/stdmsg/src/msgdialog.cpp | 2 +-
 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;
 }
 
-- 
cgit v1.2.3