From 40086f4fc370ca92218c805fe5cee10c09f57f2c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 14 May 2018 18:29:31 +0300 Subject: merge with master till: fixes #1358 (StdMsg: "Send on Ctrl+Enter" setting is lost after upgrade) --- plugins/Scriver/src/msgdialog.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins/Scriver/src/msgdialog.cpp') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index a9110a2e03..8bc0ff50cc 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -781,9 +781,8 @@ static const wchar_t *titleTokenNames[] = { L"%name%", L"%status%", L"%statusmsg void CSrmmWindow::UpdateTitle() { CMStringW wszTitle; - ptrW tmplt(db_get_wsa(0, SRMM_MODULE, SRMSGSET_WINDOWTITLE)); - if (tmplt != nullptr) - wszTitle = tmplt; + if (g_dat.wszTitleFormat[0]) + wszTitle = g_dat.wszTitleFormat; else wszTitle = L"%name% - "; @@ -803,7 +802,7 @@ void CSrmmWindow::UpdateTitle() } } - if (tmplt == nullptr) + if (g_dat.wszTitleFormat[0] == 0) wszTitle.Append(TranslateT("Message session")); TitleBarData tbd = {}; -- cgit v1.2.3