summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG/src')
-rw-r--r--protocols/JabberG/src/jabber_xstatus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index e7e19cf2e2..9974f080ca 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -1436,10 +1436,10 @@ INT_PTR __cdecl CJabberProto::OnSetXStatusEx(WPARAM wParam, LPARAM lParam)
CPepMood *pepMood = (CPepMood*)m_pepServices.Find(_T(JABBER_FEAT_USER_MOOD));
- int status = *pData->status;
+ 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 = JabberStrFixLines(pData->ptszMessage);
+ pepMood->m_text = (pData->flags & CSSF_MASK_MESSAGE) ? JabberStrFixLines(pData->ptszMessage) : _T("");
pepMood->LaunchSetGui(1);
return 0;
}