From db9ffeb3a32a652da31c0233987001bc56447dfd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Mar 2017 19:00:31 +0300 Subject: compatibility fix for old profiles --- plugins/TabSRMM/src/msgs.h | 2 +- plugins/TabSRMM/src/utils.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index a13f0bfd28..98d4722382 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -156,7 +156,7 @@ struct TLogTheme struct TContainerSettings { - bool fPrivate; + BOOL fPrivate; DWORD dwFlags; DWORD dwFlagsEx; DWORD dwTransparency; diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 06e25df02d..20fef2d1ed 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -498,16 +498,14 @@ int Utils::ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettin { memcpy(cs, &PluginConfig.globalContainerSettings, sizeof(TContainerSettings)); + if (hContact == 0 && szKey == 0) + cs->iSplitterX = M.GetDword("splitsplitx", db_get_dw(0, CHAT_MODULE, "SplitterX", 150)); + DBVARIANT dbv = { 0 }; if (0 == db_get(hContact, SRMSGMOD_T, szKey ? szKey : CNT_KEYNAME, &dbv)) { if (dbv.type == DBVT_BLOB && dbv.cpbVal > 0 && dbv.cpbVal <= sizeof(TContainerSettings)) { ::memcpy((void*)cs, (void*)dbv.pbVal, dbv.cpbVal); ::db_free(&dbv); - if (hContact == 0 && szKey == 0) { - cs->fPrivate = false; - cs->iSplitterX = M.GetDword("splitsplitx", db_get_dw(0, CHAT_MODULE, "SplitterX", 150)); - } - return 0; } cs->fPrivate = false; -- cgit v1.2.3