From e274fb91433eb14ab2830c6509435fdf2ff55872 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 24 Jun 2012 20:39:17 +0000
Subject: more correct version of MSN statuses

git-svn-id: http://svn.miranda-ng.org/main/trunk@615 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MSN/msn_commands.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'protocols/MSN')

diff --git a/protocols/MSN/msn_commands.cpp b/protocols/MSN/msn_commands.cpp
index 3fc028ad19..3902f29a25 100644
--- a/protocols/MSN/msn_commands.cpp
+++ b/protocols/MSN/msn_commands.cpp
@@ -828,17 +828,17 @@ void CMsnProto::sttProcessStatusMessage(char* buf, unsigned len, const char* wli
 
 	// Process status message info
 	char* szStatMsg = ezxml_txt(ezxml_child(xmli, "PSM"));
-	stripBBCode(szStatMsg);
-	stripColorCode(szStatMsg);
-	{
-		mir_ptr<TCHAR> tszStatMsg = mir_utf8decodeT(szStatMsg);
-		if (*tszStatMsg)
-			DBWriteContactSettingTString(hContact, "CList", "StatusMsg", tszStatMsg);
-		else
-			DBDeleteContactSetting(hContact, "CList", "StatusMsg");
-
+	if (*szStatMsg) {
+		stripBBCode(szStatMsg);
+		stripColorCode(szStatMsg);
+		mir_ptr<TCHAR> tszStatMsg( mir_utf8decodeT(szStatMsg));
+		DBWriteContactSettingTString(hContact, "CList", "StatusMsg", tszStatMsg);
 		SendBroadcast(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, NULL, (LPARAM)tszStatMsg);
 	}
+	else {
+		DBDeleteContactSetting(hContact, "CList", "StatusMsg");
+		SendBroadcast(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, NULL, NULL);
+	}
 
 	// Process current media info
 	const char* szCrntMda = ezxml_txt(ezxml_child(xmli, "CurrentMedia"));
-- 
cgit v1.2.3