summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_groupchat.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-14 14:49:06 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-14 14:49:06 +0000
commit7ff042f06d3fdaa24622f66e9c08012611fd4fa4 (patch)
tree6dcd34057d987ec1f8ca72233ba0495a59affb67 /protocols/JabberG/src/jabber_groupchat.cpp
parent662c4b333d83c70ae05fbcea2dd685e6a3524983 (diff)
various minor issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@6059 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_groupchat.cpp')
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 4e5da67049..1e15445539 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -1199,7 +1199,7 @@ void CJabberProto::GroupchatProcessMessage(HXML node)
if (resource != NULL) {
JABBER_RESOURCE_STATUS *r = item->findResource(resource);
- nick = r && r->nick ? r->nick : resource;
+ nick = (r && r->nick) ? r->nick : resource;
}
else nick = NULL;