summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-03-30 17:18:38 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-03-30 17:18:38 +0000
commitb4d1a98542c63747d1f7287be63779f054fa85da (patch)
tree7f31e328655443e3a06674af3f6473b7ac6e968b /src
parent1c2541a00e52e5dd11c8e5d1036c8208b801b25c (diff)
crash fix in Jabber
git-svn-id: http://svn.miranda-ng.org/main/trunk@16565 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/options.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 86d9846aac..3650a76fe3 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -318,14 +318,11 @@ static LRESULT CALLBACK OptionsFilterSubclassProc(HWND hWnd, UINT message, WPARA
rc2.left = 2 * rc.left - rc2.left;
rc2.bottom = 2 * rc.bottom - rc2.bottom;
rc2.right = 2 * rc.right - rc2.right;
-
DrawThemeBackground(hTheme, hdc, EP_EDITTEXT, ETS_NORMAL, &rc2, &rc);
+
HFONT hFont = (HFONT)SendMessage(hWnd, WM_GETFONT, 0, 0);
HFONT oldFont = (HFONT)SelectObject(hdc, hFont);
-
- wchar_t *bufW = mir_t2u(buf);
- DrawThemeText(hTheme, hdc, EP_EDITTEXT, ETS_DISABLED, bufW, -1, 0, 0, &rc);
- mir_free(bufW);
+ DrawThemeText(hTheme, hdc, EP_EDITTEXT, ETS_DISABLED, buf, -1, 0, 0, &rc);
SelectObject(hdc, oldFont);
CloseThemeData(hTheme);