summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/MUC')
-rw-r--r--Swiften/MUC/MUCImpl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/MUC/MUCImpl.cpp b/Swiften/MUC/MUCImpl.cpp
index 778c290..16e7421 100644
--- a/Swiften/MUC/MUCImpl.cpp
+++ b/Swiften/MUC/MUCImpl.cpp
@@ -266,7 +266,6 @@ void MUCImpl::handleIncomingPresence(Presence::ref presence) {
ownMUCJID = presence->getFrom();
presenceSender->addDirectedPresenceReceiver(ownMUCJID, DirectedPresenceSender::AndSendPresence);
}
- onJoinComplete(getOwnNick());
}
// MUC status 201: a new room has been created
if (status.code == 201) {
@@ -293,6 +292,9 @@ void MUCImpl::handleIncomingPresence(Presence::ref presence) {
}
}
}
+ if (joinComplete_ && !isLocked) {
+ onJoinComplete(getOwnNick());
+ }
if (!isLocked && !isUnlocked_ && (presence->getFrom() == ownMUCJID)) {
isUnlocked_ = true;
onUnlocked();