From 35a19403d645a35bfbc5f74403f300a7ddde9574 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, 29 May 2019 06:26:22 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@798 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io_utils/piconnection.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src_main/io_utils/piconnection.cpp b/src_main/io_utils/piconnection.cpp index 575d90ef..63d24ef1 100644 --- a/src_main/io_utils/piconnection.cpp +++ b/src_main/io_utils/piconnection.cpp @@ -1119,13 +1119,14 @@ void PIConnection::DevicePool::run() { void __DevicePool_threadReadDP(void * ddp) { PIConnection::DevicePool::DeviceData * dd((PIConnection::DevicePool::DeviceData * )ddp); if (dd->dev == 0) {piMSleep(100); return;} - if (dd->dev->isClosed()) - if (!dd->dev->open()) {piMSleep(dd->dev->reopenTimeout()); return;} + PIIODevice * dev = dd->dev; + if (dev->isClosed()) + if (!dev->open()) {piMSleep(dev->reopenTimeout()); return;} PIByteArray ba; - ba = dd->dev->read(dd->dev->threadedReadBufferSize()); + ba = dev->read(dev->threadedReadBufferSize()); // dd->dev->threadedRead(ba.data(), ba.size()); if (ba.isEmpty()) {piMSleep(10); return;} - dd->dev->threadedRead(ba.data(), ba.size_s()); + dev->threadedRead(ba.data(), ba.size_s()); //piCout << "Readed from" << dd->dev->path() << Hex << ba; __device_pool__->deviceReaded(dd, ba); }