summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-19 16:15:49 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-19 16:15:49 +0000
commita6e575cd6bcef8a7ceafc2bd4cc70d1fd8bd9775 (patch)
tree6f95c54340b62150f003179fa0d201807a88f8a3
parent146f32de4c288f1900b5a8f168290dc2bbd40530 (diff)
no need to read settings from db when they are in memory
git-svn-id: http://svn.miranda-ng.org/main/trunk@7763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/TabSRMM/src/chat/tools.cpp2
-rw-r--r--plugins/TabSRMM/src/generic_msghandlers.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index eacb336a73..7419a3851a 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -139,7 +139,7 @@ int ShowPopup(HANDLE hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName
pd.colorText = g_Settings.crPUTextColour;
}
else {
- pd.colorBack = M.GetDword(FONTMODULE, SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR);
+ pd.colorBack = g_Settings.crLogBackground;
pd.colorText = crBkg;
}
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 005ff4d7e6..a1f7bbd9ae 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -765,7 +765,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat)
HWND hwndDlg = dat->hwnd;
dat->inputbg = fIsChat ? M.GetDword(FONTMODULE, "inputbg", SRMSGDEFSET_BKGCOLOUR) : dat->pContainer->theme.inputbg;
- COLORREF colour = fIsChat ? M.GetDword(FONTMODULE, SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR) : dat->pContainer->theme.bg;
+ COLORREF colour = fIsChat ? g_Settings.crLogBackground : dat->pContainer->theme.bg;
COLORREF inputcharcolor;
if (!fIsChat && GetWindowTextLengthA(hwndEdit) > 0)