From 3983ee16482342c6b1272bb20dc5ca909ceae61e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 7 Sep 2016 11:11:11 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@259 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/io/piconnection.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/io/piconnection.cpp b/src/io/piconnection.cpp index b1e64d24..d348b8e8 100755 --- a/src/io/piconnection.cpp +++ b/src/io/piconnection.cpp @@ -1044,6 +1044,8 @@ PIVector PIConnection::DevicePool::boundedDevices(const PIConnect PIConnection::DevicePool::DeviceData::~DeviceData() { if (rthread != 0) { rthread->stop(); + if (!rthread->waitForFinish(1000)) + rthread->terminate(); delete rthread; rthread = 0; }