crash fix in Jabber

git-svn-id: http://svn.miranda-ng.org/main/trunk@16565 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 4 insertions, 7 deletions

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 02b0766e78..296a427470 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -420,10 +420,10 @@ LBL_FatalError:
 				if (nSelRes == -1) // error

 					break;

 				else if (nSelRes == 0 && m_bSendKeepAlive) {

-					if (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_PING) {

+					if (info.jabberServerCaps & JABBER_CAPS_PING) {

 						CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnPingReply, JABBER_IQ_TYPE_GET, NULL, 0, -1, this);

 						pInfo->SetTimeout(m_options.ConnectionKeepAliveTimeout);

-						info.send(XmlNodeIq(pInfo) << XATTR(_T("from"), m_ThreadInfo->fullJID) << XCHILDNS(_T("ping"), JABBER_FEAT_PING));

+						info.send(XmlNodeIq(pInfo) << XATTR(_T("from"), info.fullJID) << XCHILDNS(_T("ping"), JABBER_FEAT_PING));

 					}

 					else info.send(" \t ");

 					continue;

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);