From 81fe3113234c0610ce49de0299f43ae12d985a14 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Sat, 12 Jun 2010 09:28:41 +0100
Subject: Apply MUC Conflict resolution until a successful nick is found.

Resolves: #460

diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 544043d..74b58dc 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -117,6 +117,7 @@ void MUCController::handleJoinFailed(boost::shared_ptr<ErrorPayload> error) {
 	errorMessage += ".";
 	chatWindow_->addErrorMessage(errorMessage);
 	if (!rejoinNick.isEmpty()) {
+		nick_ = rejoinNick;
 		muc_->joinAs(rejoinNick);
 	}
 }
-- 
cgit v0.10.2-6-g49f6