diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2021-01-07 21:22:55 +0100 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2021-01-07 21:25:57 +0100 |
| commit | 6af9ae29cb3c29e8e196d303409da369d23c3450 (patch) | |
| tree | 94c089f3333003747095a43e21c9ef49bf1bde80 | |
| parent | 32794f67621f87fa796c423a900385e6a1fba4b9 (diff) | |
| download | libquotient-6af9ae29cb3c29e8e196d303409da369d23c3450.tar.gz libquotient-6af9ae29cb3c29e8e196d303409da369d23c3450.zip | |
Connection::resolveServer: abandon is not a failure
So just reset the base URL and return, with no error signals.
(cherry picked from commit be00308ad67286b45912202750fe49fb87f16e4a)
| -rw-r--r-- | lib/connection.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index 9afdfe7e..b8b131bf 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -287,10 +287,14 @@ void Connection::resolveServer(const QString& mxid) const auto& oldBaseUrl = d->data->baseUrl(); d->data->setBaseUrl(maybeBaseUrl); // Temporarily set it for this one call d->resolverJob = callApi<GetWellknownJob>(); + // Connect to finished() to make sure baseUrl is restored in any case connect(d->resolverJob, &BaseJob::finished, this, [this, maybeBaseUrl, oldBaseUrl] { // Revert baseUrl so that setHomeserver() below triggers signals // in case the base URL actually changed d->data->setBaseUrl(oldBaseUrl); + if (d->resolverJob->error() == BaseJob::Abandoned) + return; + if (d->resolverJob->error() != BaseJob::NotFoundError) { if (!d->resolverJob->status().good()) { qCWarning(MAIN) @@ -318,7 +322,7 @@ void Connection::resolveServer(const QString& mxid) << "for base URL"; setHomeserver(maybeBaseUrl); } - Q_ASSERT(d->loginFlowsJob != nullptr); + Q_ASSERT(d->loginFlowsJob != nullptr); // Ensured by setHomeserver() connect(d->loginFlowsJob, &BaseJob::success, this, &Connection::resolved); connect(d->loginFlowsJob, &BaseJob::failure, this, [this] { |