summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/NickResolver.cpp')
-rw-r--r--Swift/Controllers/NickResolver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/NickResolver.cpp b/Swift/Controllers/NickResolver.cpp
index ed2c8df..29ff51b 100644
--- a/Swift/Controllers/NickResolver.cpp
+++ b/Swift/Controllers/NickResolver.cpp
@@ -26,7 +26,7 @@ String NickResolver::jidToNick(const JID& jid) {
String nick;
if (mucRegistry_ && mucRegistry_->isMUC(jid.toBare()) ) {
- return jid.getResource();
+ return jid.getResource().isEmpty() ? jid.toBare().toString() : jid.getResource();
}
if (xmppRoster_->containsJID(jid) && !xmppRoster_->getNameForJID(jid).isEmpty()) {