Commit 1d457c2b authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/release/20.04'

parents 5c9dade9 e3c13637
Pipeline #24950 passed with stage
in 28 minutes and 22 seconds
......@@ -204,7 +204,7 @@ void Session::scheduleJob(SieveJob *job)
void Session::killJob(SieveJob *job, KJob::KillVerbosity verbosity)
{
qCDebug(KMANAGERSIEVE_LOG) << objectName() << Q_FUNC_INFO << job;
qCDebug(KMANAGERSIEVE_LOG) << objectName() << Q_FUNC_INFO << "job " << job << " m_currentJob " << m_currentJob << " verbosity " << verbosity;
if (m_currentJob == job) {
if (verbosity == KJob::EmitResult) {
m_currentJob->d->killed();
......@@ -214,6 +214,8 @@ void Session::killJob(SieveJob *job, KJob::KillVerbosity verbosity)
m_jobs.removeAll(job);
if (verbosity == KJob::EmitResult) {
job->d->killed();
} else {
job->deleteLater();
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment