Merge branch 'Plasma/5.14'

kuiserver/jobview.cpp

@@ -53,6 +53,7 @@ JobView::~JobView()
 
 void JobView::terminate(const QString &errorMessage)
 {
+    qDebug() << "is terminated" << errorMessage;
     QDBusConnection::sessionBus().unregisterObject(m_objectPath.path(), QDBusConnection::UnregisterTree);
 
     typedef QPair<QString, QDBusAbstractInterface*> iFacePair;
@@ -77,6 +78,11 @@ void JobView::terminate(const QString &errorMessage)
     m_isTerminated = true;
 }
 
+bool JobView::isTerminated() const
+{
+    return m_isTerminated;
+}
+
 void JobView::requestSuspend()
 {
     emit suspendRequested();

kuiserver/jobview.h

@@ -109,6 +109,7 @@ public:
 
     QDBusObjectPath objectPath() const;
 
+    bool isTerminated() const;
 
 
      /**

kuiserver/progresslistmodel.cpp

@@ -325,6 +325,9 @@ void ProgressListModel::serviceUnregistered(const QString &name)
     if (!jobs.isEmpty()) {
         m_jobViewsOwners.remove(name);
         Q_FOREACH(JobView *job, jobs) {
+            if (job->isTerminated()) {
+                continue;
+            }
             job->setError(KIO::ERR_SLAVE_DIED);
             job->terminate(job->errorText());
         }