# # # patch "src/monotone/MonotoneManager.cpp" # from [5fa6128ee84079d367d90e4f86d240bed8172de7] # to [57056ba7ca863825592a9884f4ac39528521b857] # ============================================================ --- src/monotone/MonotoneManager.cpp 5fa6128ee84079d367d90e4f86d240bed8172de7 +++ src/monotone/MonotoneManager.cpp 57056ba7ca863825592a9884f4ac39528521b857 @@ -32,15 +32,13 @@ MonotoneManager::~MonotoneManager() MonotoneManager::~MonotoneManager() { - QMapIterator it(threadMap); - while (it.hasNext()) + QList threadIDs = threadMap.keys(); + foreach (int threadID, threadIDs) { - it.next(); - MonotoneThreadPtr thread = it.value(); - thread->abort(); - thread->wait(); + stopThread(threadID); + removeThread(threadID); + L(QString("thread %1 stopped and removed").arg(threadID)); } - threadMap.clear(); } bool MonotoneManager::setMonotoneBinaryPath(const QString & mtnBinary,