Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 16 files). Show all
Unified · Split
| @@ -116,8 +116,11 @@ void AssignmentClient::stopAssignmentClient() { · 115 unmodified lines | |||
| 116 | _statsTimerACM.stop(); | 116 | _statsTimerACM.stop(); |
| 117 | if (_currentAssignment) { | 117 | if (_currentAssignment) { |
| 118 | _currentAssignment->aboutToQuit(); | 118 | _currentAssignment->aboutToQuit(); |
| 119 | // _currentAssignment->aboutToFinish(); | 119 | QThread* currentAssignmentThread = _currentAssignment->thread(); |
| 120 | _currentAssignment->thread()->wait(); | 120 | qDebug() << "main thread waiting on _currentAssignment->thread()" << currentAssignmentThread->objectName(); |
| 121 | currentAssignmentThread->quit(); | ||
| 122 | currentAssignmentThread->wait(); | ||
| 123 | qDebug() << "done waiting."; | ||
| 121 | } | 124 | } |
| 122 | } | 125 | } |
| 123 | 126 | ||