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() {