Fix a race condition leading to a crash on close

It seems that some reply processing still might have happened after
BaseJob::abandon() (caused in turn by destroying a Connection object),
probably because the event from QNetworkReply landed in the event queue
after BaseJob::abandon() but before actual deletion of a job object. Now
countered by disconnecting from QNetworkReply signals in abandon() and
stop().

1 files changed, 11 insertions, 7 deletions

diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp
index 26ceb268..8c9ef222 100644
--- a/jobs/basejob.cpp
+++ b/jobs/basejob.cpp
@@ -219,16 +219,17 @@ BaseJob::Status BaseJob::parseJson(const QJsonDocument&)
 void BaseJob::stop()
 {
     d->timer.stop();
-    if (!d->reply)
+    if (d->reply)
     {
-        qCWarning(d->logCat) << this << "stopped with empty network reply";
-    }
-    else if (d->reply->isRunning())
-    {
-        qCWarning(d->logCat) << this << "stopped without ready network reply";
         d->reply->disconnect(this); // Ignore whatever comes from the reply
-        d->reply->abort();
+        if (d->reply->isRunning())
+        {
+            qCWarning(d->logCat) << this << "stopped without ready network reply";
+            d->reply->abort();
+        }
     }
+    else
+        qCWarning(d->logCat) << this << "stopped with empty network reply";
 }
 
 void BaseJob::finishJob()
@@ -320,6 +321,9 @@ void BaseJob::setStatus(int code, QString message)
 
 void BaseJob::abandon()
 {
+    this->disconnect();
+    if (d->reply)
+        d->reply->disconnect(this);
     deleteLater();
 }