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@646 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2018-10-16 06:59:15 +00:00
parent 0097e83b39
commit dd00a36be3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src_main/io_utils/piconnection.cpp
View File

@@ -939,6 +939,10 @@ PIConnection::DevicePool::DevicePool(): PIThread(false, 10) {
}
PIConnection::DevicePool::~DevicePool() {
}
void PIConnection::DevicePool::init() {
if (!isRunning())
start(10);
@@ -1088,14 +1092,12 @@ PIVector<PIIODevice * > PIConnection::DevicePool::boundedDevices(const PIConnect
PIConnection::DevicePool::DeviceData::~DeviceData() {
if (rthread != 0) {
rthread->stop();
if (!rthread->waitForFinish(1000))
rthread->terminate();
if (rthread) {
rthread->terminate();
delete rthread;
rthread = 0;
}
if (dev != 0) {
if (dev) {
dev->close();
delete dev;
dev = 0;