SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@679 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2019-01-11 13:16:06 +00:00
parent e902f26d9b
commit 6ac3c1548b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src_main/thread/pipipelinethread.h
View File

@@ -83,12 +83,14 @@ public:
next_overload = false; next_overload = false;
mutex.unlock(); mutex.unlock();
} }
void stopCalc() { void stopCalc(int wait_delay = 100) {
if (isRunning()) { if (isRunning()) {
stop(); stop();
if (!waitForFinish(100)) terminate(); if (!waitForFinish(wait_delay)) {
mutex.unlock();
mutex_l.unlock(); mutex_l.unlock();
mutex.unlock();
terminate();
}
} }
} }
Tout getLast() { Tout getLast() {