Swiftdiff options
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 596edd2..d6a5587 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -333,6 +333,9 @@ void MainController::performLoginFromCachedCredentials() { } client_->onError.connect(boost::bind(&MainController::handleError, this, _1)); client_->onConnected.connect(boost::bind(&MainController::handleConnected, this)); + } else { + /* In case we're in the middle of another login, make sure they don't overlap */ + client_->disconnect(); } client_->connect(); } @@ -387,7 +390,7 @@ void MainController::signOut() { } void MainController::logout() { - if (client_ && client_->isAvailable()) { + if (client_ /*&& client_->isAvailable()*/) { client_->disconnect(); } if (rosterController_) { |