From 6ac3c1548b277f2845a01cc9d792e363f86971a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Fri, 11 Jan 2019 13:16:06 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@679
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/thread/pipipelinethread.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src_main/thread/pipipelinethread.h b/src_main/thread/pipipelinethread.h
index 8ab8483d..ea849cd1 100644
--- 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();
-			mutex_l.unlock();
+			if (!waitForFinish(wait_delay)) {
+				mutex_l.unlock();
+				mutex.unlock();
+				terminate();
+			}
 		}
 	}
 	Tout getLast() {