diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-19 08:48:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-19 08:48:44 +0000 |
| commit | 4c228715064267be315d0c5104c33543f0cd7ff8 (patch) | |
| tree | d897b0fc078a741f1c481ca0c74429173515a896 | |
| parent | 529c7d557a7dc8693c68c0fb66275e9fe999c0d2 (diff) | |
fix for rereading nicklist colors in tabSRMM
git-svn-id: http://svn.miranda-ng.org/main/trunk@7744 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TabSRMM/src/chat/options.cpp | 11 | ||||
| -rw-r--r-- | src/modules/chat/chat_svc.cpp | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index e10353e4db..1bdab48f4e 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -183,7 +183,6 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM {
char str[32];
int style;
- DBVARIANT dbv;
int j = (i >= 100 ? i - 100 : i);
FontOptionsList *fol = fontOptionsList;
@@ -229,12 +228,11 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM lstrcpyn(lf->lfFaceName, _T("Webdings"), SIZEOF(lf->lfFaceName));
}
else {
- if (db_get_ts(NULL, szMod, str, &dbv))
+ ptrT tszDefFace(db_get_tsa(NULL, szMod, str));
+ if (tszDefFace == NULL)
lstrcpy(lf->lfFaceName, fol[j].szDefFace);
- else {
- lstrcpyn(lf->lfFaceName, dbv.ptszVal, SIZEOF(lf->lfFaceName));
- db_free(&dbv);
- }
+ else
+ lstrcpyn(lf->lfFaceName, tszDefFace, SIZEOF(lf->lfFaceName));
}
}
}
@@ -242,7 +240,6 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM static HTREEITEM InsertBranch(HWND hwndTree, TCHAR* pszDescr, BOOL bExpanded)
{
TVINSERTSTRUCT tvis;
-
tvis.hParent = NULL;
tvis.hInsertAfter = TVI_LAST;
tvis.item.mask = TVIF_TEXT | TVIF_STATE;
diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp index de9e7dc464..c0ab9d8116 100644 --- a/src/modules/chat/chat_svc.cpp +++ b/src/modules/chat/chat_svc.cpp @@ -72,6 +72,7 @@ void LoadChatIcons(void) static int FontsChanged(WPARAM wParam, LPARAM lParam)
{
+ LoadGlobalSettings();
LoadLogFonts();
SetIndentSize();
|