Fix logout

Fix the account editor setting page and the controller logout function so that you can logout without crashing.
2022-11-20 16:55:50 +00:00
parent cd257137ba
commit c0b29afc47
2 changed files with 6 additions and 3 deletions
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -291,8 +291,11 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
    job.start();
    loop.exec();

-    if (conn == activeConnection() && AccountRegistry::instance().count() > 1) {
-        setActiveConnection(AccountRegistry::instance().accounts()[0]);
+    if (AccountRegistry::instance().count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (conn == activeConnection()) {
+            setActiveConnection(AccountRegistry::instance().accounts()[0]);
+        }
    } else {
        setActiveConnection(nullptr);
    }