summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-07-25 18:30:13 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-07-25 18:30:13 (GMT)
commit501989d4b371c850a1c5a0350ca3f1c4900305f4 (patch)
tree532bb021fc3eeb28ccdb1aa909fac4a70979e6ce
parent70ba4f2e4f35577a0a1544b9677e154231c98aba (diff)
downloadswift-contrib-501989d4b371c850a1c5a0350ca3f1c4900305f4.zip
swift-contrib-501989d4b371c850a1c5a0350ca3f1c4900305f4.tar.bz2
Fix MUC nick conflict resolution.
Resolves: #514
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 4abab99..405272e 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -131,6 +131,7 @@ void MUCController::handleJoinFailed(boost::shared_ptr<ErrorPayload> error) {
chatWindow_->addErrorMessage(errorMessage);
if (!rejoinNick.isEmpty()) {
nick_ = rejoinNick;
+ parting_ = true;
rejoin();
}
}