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

2019-01-11 13:16:06 +00:00
parent e902f26d9b
commit 6ac3c1548b
1 changed files with 6 additions and 4 deletions
--- a/src_main/thread/pipipelinethread.h
+++ b/src_main/thread/pipipelinethread.h
@@ -83,12 +83,14 @@ public:
 		next_overload = false;
 		mutex.unlock();
 	}
-	void stopCalc() {
+	void stopCalc(int wait_delay = 100) {
 		if (isRunning()) {
 			stop();
-			if (!waitForFinish(100)) terminate();
-			mutex.unlock();
+			if (!waitForFinish(wait_delay)) {
 				mutex_l.unlock();
+				mutex.unlock();
+				terminate();
+			}
 		}
 	}
 	Tout getLast() {