From cbed358b159626ddc41f5c8b98a705a02f072c35 Mon Sep 17 00:00:00 2001 From: Kevin Smith <git@kismith.co.uk> Date: Wed, 19 Oct 2011 13:37:45 +0100 Subject: Allow rejoining rooms after join failure. Resolves: #1019 diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 1120f4b..dd109a3 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -236,9 +236,9 @@ void MUCController::handleJoinFailed(boost::shared_ptr<ErrorPayload> error) { } errorMessage = str(format(QT_TRANSLATE_NOOP("", "Couldn't join room: %1%.")) % errorMessage); chatWindow_->addErrorMessage(errorMessage); + parting_ = true; if (!rejoinNick.empty()) { nick_ = rejoinNick; - parting_ = true; rejoin(); } } -- cgit v0.10.2-6-g49f6