From 9f1cb2a4e54a17c8a8eb9e600495f220bc444c66 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 1 May 2015 16:56:39 -0700 Subject: [PATCH] fix kill/terminate order --- assignment-client/src/AssignmentClientMonitor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index 873a79a414..6414f33644 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -98,7 +98,7 @@ void AssignmentClientMonitor::stopChildProcesses() { QMutableListIterator i(_childProcesses); while (i.hasNext()) { QProcess* childProcess = i.next(); - childProcess->kill(); + childProcess->terminate(); } // try to give all the children time to shutdown @@ -108,7 +108,7 @@ void AssignmentClientMonitor::stopChildProcesses() { QMutableListIterator j(_childProcesses); while (j.hasNext()) { QProcess* childProcess = j.next(); - childProcess->terminate(); + childProcess->kill(); } waitOnChildren(WAIT_FOR_CHILD_MSECS);