diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2021-01-07 20:16:59 +0100 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2021-01-07 21:23:59 +0100 |
| commit | 8fc5de0529458851a4cd5c042b2b2f2543068c22 (patch) | |
| tree | 62c93ad76bb54ef93e613b61639d583ea672a15a | |
| parent | 23f2bb6ca3c0c44fd8972902b4d9b5d6c23d52e7 (diff) | |
| download | libquotient-8fc5de0529458851a4cd5c042b2b2f2543068c22.tar.gz libquotient-8fc5de0529458851a4cd5c042b2b2f2543068c22.zip | |
Prefer connecting to BaseJob::result(), not finished()
...because finished() includes abandoning and should only be relevant
when lifecycle issues are involved.
(cherry picked from commit 90d41b697af39253483d9bcca4e57b11d2197112)
| -rw-r--r-- | lib/connection.cpp | 2 | ||||
| -rw-r--r-- | tests/quotest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index 42b17570..9afdfe7e 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -1555,7 +1555,7 @@ void Connection::setHomeserver(const QUrl& url) // Whenever a homeserver is updated, retrieve available login flows from it d->loginFlowsJob = callApi<GetLoginFlowsJob>(BackgroundRequest); - connect(d->loginFlowsJob, &BaseJob::finished, this, [this] { + connect(d->loginFlowsJob, &BaseJob::result, this, [this] { if (d->loginFlowsJob->status().good()) d->loginFlows = d->loginFlowsJob->flows(); else diff --git a/tests/quotest.cpp b/tests/quotest.cpp index a0bad753..7ab7365f 100644 --- a/tests/quotest.cpp +++ b/tests/quotest.cpp @@ -828,7 +828,7 @@ void TestManager::conclude() // .then(this, &TestManager::finalize); // Qt-style or // .then([this] { finalize(); }); // STL-style auto* job = room->leaveRoom(); - connect(job, &BaseJob::finished, this, [this, job,plainReport] { + connect(job, &BaseJob::result, this, [this, job,plainReport] { Q_ASSERT(job->status().good()); finalize(); // Still flying, as the exit() connection in finalize() is queued |