From efe64be035fa04d5db79e75b8d2ce227c96e0c67 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 30 Dec 2014 22:17:19 +0000
Subject: fix for the memory allocation conflict

git-svn-id: http://svn.miranda-ng.org/main/trunk@11687 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_xstatus.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 4826a73d42..7f104f46d5 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -612,7 +612,7 @@ CPepMood::CPepMood(CJabberProto *proto) :
 
 CPepMood::~CPepMood()
 {
-	if (m_text) mir_free(m_text);
+	mir_free(m_text);
 }
 
 void CPepMood::ProcessItems(const TCHAR *from, HXML itemsNode)
@@ -1425,7 +1425,7 @@ INT_PTR __cdecl CJabberProto::OnSetXStatusEx(WPARAM, LPARAM lParam)
 	int status = (pData->flags & CSSF_MASK_STATUS) ? *pData->status : pepMood->m_mode;
 	if (status >= 0 && status < SIZEOF(g_arrMoods)) {
 		pepMood->m_mode = status;
-		pepMood->m_text = (pData->flags & CSSF_MASK_MESSAGE) ? JabberStrFixLines(pData->ptszMessage) : _T("");
+		pepMood->m_text = (pData->flags & CSSF_MASK_MESSAGE) ? JabberStrFixLines(pData->ptszMessage) : NULL;
 		pepMood->LaunchSetGui(1);
 		return 0;
 	}
-- 
cgit v1.2.3