From f95e7a84fc77ec0c535970a68b2600f15dc1e12d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Mar 2017 19:30:17 +0300 Subject: returned back the binary compatibility of tabsrmm container settings --- plugins/TabSRMM/src/globals.cpp | 1 + plugins/TabSRMM/src/msgs.h | 1 + plugins/TabSRMM/src/utils.cpp | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 378f3e481c..4b022093c7 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -196,6 +196,7 @@ void CGlobals::reloadSettings(bool fReloadSkins) m_cRichBorders = M.GetDword(FONTMODULE, "cRichBorders", 0); ::memcpy(&globalContainerSettings, &_cnt_default, sizeof(TContainerSettings)); + globalContainerSettings.iSplitterX = db_get_dw(0, CHAT_MODULE, "SplitterX", 150); Utils::ReadContainerSettingsFromDB(0, &globalContainerSettings); globalContainerSettings.fPrivate = false; if (fReloadSkins) diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 98d4722382..ddcd017fa4 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -167,6 +167,7 @@ struct TContainerSettings WORD ownAvatarMode; WORD autoCloseSeconds; int iSplitterX; + BYTE reserved[10]; }; struct ButtonItem; diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 20fef2d1ed..d7027d59e4 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -498,9 +498,6 @@ 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)) { -- cgit v1.2.3