fix kill/terminate order

Seth Alves committed 11 years ago

Commit 9f1cb2a1 parent 23c44501 file · +2 −2Browse files

Showing the changes to assignment-client/src/AssignmentClientMonitor.cpp (1 of 1 file). Show all

Unified · Split

assignment-client/src/AssignmentClientMonitor.cpp+2−2

@@ -98,7 +98,7 @@ void AssignmentClientMonitor::stopChildProcesses() { · 97 unmodified lines
98	98	QMutableListIterator<QProcess*> i(_childProcesses);
99	99	while (i.hasNext()) {
100	100	QProcess* childProcess = i.next();
101		− childProcess->kill();
	101	+ childProcess->terminate();
102	102	}
103	103
104	104	// try to give all the children time to shutdown
@@ -108,7 +108,7 @@ void AssignmentClientMonitor::stopChildProcesses() { · 3 unmodified lines
108	108	QMutableListIterator<QProcess*> j(_childProcesses);
109	109	while (j.hasNext()) {
110	110	QProcess* childProcess = j.next();
111		− childProcess->terminate();
	111	+ childProcess->kill();
112	112	}
113	113
114	114	waitOnChildren(WAIT_FOR_CHILD_MSECS);