summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-10-19 12:37:45 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-10-19 15:36:21 (GMT)
commitcbed358b159626ddc41f5c8b98a705a02f072c35 (patch)
treea11800e5f71830b625d3d81d60199b18b9b4123c /Swift
parent30359b48e18bcf171a53d50d84a178b9cb376d7a (diff)
downloadswift-contrib-cbed358b159626ddc41f5c8b98a705a02f072c35.zip
swift-contrib-cbed358b159626ddc41f5c8b98a705a02f072c35.tar.bz2
Allow rejoining rooms after join failure.
Resolves: #1019
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp2
1 files changed, 1 insertions, 1 deletions
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();
}
}