From 501989d4b371c850a1c5a0350ca3f1c4900305f4 Mon Sep 17 00:00:00 2001 From: Kevin Smith <git@kismith.co.uk> Date: Sun, 25 Jul 2010 19:30:13 +0100 Subject: Fix MUC nick conflict resolution. Resolves: #514 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(); } } -- cgit v0.10.2-6-g49f6