From fe66480d4f6d96444ca090df2ae04dc7da033ea4 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 31 May 2022 19:43:01 +0200 Subject: Remove accounts from accountsLoading when they're no longer loading --- lib/accountregistry.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/accountregistry.cpp b/lib/accountregistry.cpp index b40d5ecf..289f20dd 100644 --- a/lib/accountregistry.cpp +++ b/lib/accountregistry.cpp @@ -99,20 +99,29 @@ void AccountRegistry::invokeLogin() AccountSettings account { accountId }; auto connection = new Connection(account.homeserver()); connect(connection, &Connection::connected, this, - [connection] { + [connection, this, accountId] { connection->loadState(); connection->setLazyLoading(true); connection->syncLoop(); + + m_accountsLoading.removeAll(accountId); + emit accountsLoadingChanged(); }); connect(connection, &Connection::loginError, this, - [this, connection](const QString& error, + [this, connection, accountId](const QString& error, const QString& details) { emit loginError(connection, error, details); + + m_accountsLoading.removeAll(accountId); + emit accountsLoadingChanged(); }); connect(connection, &Connection::resolveError, this, - [this, connection](const QString& error) { + [this, connection, accountId](const QString& error) { emit resolveError(connection, error); + + m_accountsLoading.removeAll(accountId); + emit accountsLoadingChanged(); }); connection->assumeIdentity( account.userId(), accessTokenLoadingJob->binaryData(), -- cgit v1.2.3