Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:47:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix kill/terminate order

Browse source
This commit is contained in:
Seth Alves 2015-05-01 16:56:39 -07:00
parent 23c44500d8
commit 9f1cb2a4e5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -98,7 +98,7 @@ void AssignmentClientMonitor::stopChildProcesses() {
QMutableListIterator<QProcess*> i(_childProcesses); QMutableListIterator<QProcess*> i(_childProcesses);
while (i.hasNext()) { while (i.hasNext()) {
QProcess* childProcess = i.next(); QProcess* childProcess = i.next();
childProcess->kill(); childProcess->terminate();
} }
// try to give all the children time to shutdown // try to give all the children time to shutdown
@ -108,7 +108,7 @@ void AssignmentClientMonitor::stopChildProcesses() {
QMutableListIterator<QProcess*> j(_childProcesses); QMutableListIterator<QProcess*> j(_childProcesses);
while (j.hasNext()) { while (j.hasNext()) {
QProcess* childProcess = j.next(); QProcess* childProcess = j.next();
childProcess->terminate(); childProcess->kill();
} }
waitOnChildren(WAIT_FOR_CHILD_MSECS); waitOnChildren(WAIT_FOR_CHILD_MSECS);