summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-27 19:54:51 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-27 19:57:19 (GMT)
commit73c97d9222040b6160321a32e55a5a3913923e5e (patch)
tree5cb752d782f1c8a67835948b581cdd9a6ed48a08
parentaa2d0601d4f4ccb08fc817775c7783aece9d7d43 (diff)
downloadswift-73c97d9222040b6160321a32e55a5a3913923e5e.zip
swift-73c97d9222040b6160321a32e55a5a3913923e5e.tar.bz2
Reset the login view's isLoggingIn on cancel login.
-rw-r--r--Swift/Controllers/MainController.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 6133ffa..63cac11 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -495,6 +495,7 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro
else if (!rosterController_) { //hasn't been logged in yet
signOut();
loginWindow_->setMessage(message);
+ loginWindow_->setIsLoggingIn(false);
} else {
logout();
setReconnectTimer();
@@ -508,6 +509,9 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro
eventController_->handleIncomingEvent(lastDisconnectError_);
}
}
+ else if (!rosterController_) { //hasn't been logged in yet
+ loginWindow_->setIsLoggingIn(false);
+ }
}
void MainController::setReconnectTimer() {