diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-14 18:29:31 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-14 18:29:31 +0300 |
| commit | 40086f4fc370ca92218c805fe5cee10c09f57f2c (patch) | |
| tree | eca73024f9ad1d5434821061a8b8a4ca899eb748 /plugins/Scriver/src/msgdialog.cpp | |
| parent | 3f1628f127d35aa14da97e50c2a94cfd61ad52dd (diff) | |
merge with master till:
fixes #1358 (StdMsg: "Send on Ctrl+Enter" setting is lost after upgrade)
Diffstat (limited to 'plugins/Scriver/src/msgdialog.cpp')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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 = {};
|