Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-06-12 08:28:41 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-06-12 08:28:41 (GMT) |
| commit | 81fe3113234c0610ce49de0299f43ae12d985a14 (patch) | |
| tree | cb745a8958262aa74a65423aeb16955ecefbfdef | |
| parent | 175e2914e122cd285668254d2507b145929a4a0c (diff) | |
| download | swift-81fe3113234c0610ce49de0299f43ae12d985a14.zip swift-81fe3113234c0610ce49de0299f43ae12d985a14.tar.bz2 | |
Apply MUC Conflict resolution until a successful nick is found.
Resolves: #460
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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); } } |