Commit 127cd631 authored by Eugene Popov's avatar Eugene Popov 🇺🇦 Committed by David Edmundson
Browse files

[startplasma] Do not call QProcess::close() before QProcess::terminate()

Calling QProcess::close() before QProcess::terminate() will cause the process to be killed before we try to terminate it.

BUG: 97716
parent ff817abc
Pipeline #177871 passed with stage
in 6 minutes and 11 seconds
......@@ -71,15 +71,12 @@ void gentleTermination(QProcess *p)
return;
}
p->close();
p->terminate();
// Wait longer for a session than a greeter
if (!p->waitForFinished(5000)) {
qCWarning(PLASMA_STARTUP) << "Could not fully finish the process" << p->program();
p->kill();
if (!p->waitForFinished(5000)) {
qCWarning(PLASMA_STARTUP) << "Could not fully finish the process" << p->program();
}
}
}
......
Supports Markdown
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