From 1c2e5d128a7176ae827dda1e2a8fcc64e772a148 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 4 Jun 2020 12:55:23 +0300
Subject: fixes #2420 (empty error window in StdMsg/Scriver)

---
 src/core/stdmsg/src/msgtimedout.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp
index f0351042b3..25df4af3c4 100644
--- a/src/core/stdmsg/src/msgtimedout.cpp
+++ b/src/core/stdmsg/src/msgtimedout.cpp
@@ -26,11 +26,14 @@ class CErrorDlg : public CDlgBase
 {
 	TMsgQueue *m_item;
 	CMStringW  m_wszErr;
+	CCtrlBase  m_errorText, m_msgText;
 
 public:
 	CErrorDlg(TMsgQueue *item, const wchar_t *err, HWND hwndParent) :
 		CDlgBase(g_plugin, IDD_MSGSENDERROR),
-		m_item(item)
+		m_item(item),
+		m_msgText(this, IDC_MSGTEXT),
+		m_errorText(this, IDC_ERRORTEXT)
 	{
 		if (err)
 			m_wszErr = err;
@@ -41,11 +44,11 @@ public:
 	bool OnInitDialog() override
 	{
 		if (m_wszErr.IsEmpty())
-			SetCaption(TranslateT("An unknown error has occurred."));
+			m_errorText.SetText(TranslateT("An unknown error has occurred."));
 		else
-			SetCaption(m_wszErr);
+			m_errorText.SetText(m_wszErr);
 
-		SetDlgItemText(m_hwnd, IDC_MSGTEXT, ptrW(mir_utf8decodeW(m_item->szMsg)));
+		m_msgText.SetText(ptrW(mir_utf8decodeW(m_item->szMsg)));
 
 		if (m_hwndParent != nullptr) {
 			RECT rc, rcParent;
-- 
cgit v1.2.3