PIPacketExtractor fix
This commit is contained in:
@@ -707,7 +707,7 @@ bool PISerial::openDevice() {
|
|||||||
PIString wp = "//./" + p;
|
PIString wp = "//./" + p;
|
||||||
PRIVATE->hCom = CreateFileA(wp.dataAscii(), ds, sm, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
|
PRIVATE->hCom = CreateFileA(wp.dataAscii(), ds, sm, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, 0);
|
||||||
if (PRIVATE->hCom == INVALID_HANDLE_VALUE) {
|
if (PRIVATE->hCom == INVALID_HANDLE_VALUE) {
|
||||||
piCoutObj << "Unable to open \"" << p << "\"";
|
piCoutObj << "Unable to open \"" << p << "\"" << errorString();
|
||||||
fd = -1;
|
fd = -1;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,13 +305,17 @@ PIString PIPacketExtractor::constructFullPathDevice() const {
|
|||||||
|
|
||||||
|
|
||||||
bool PIPacketExtractor::openDevice() {
|
bool PIPacketExtractor::openDevice() {
|
||||||
if (dev) return dev->open();
|
if (dev) {
|
||||||
|
if (!dev->isOpened()) return dev->open();
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool PIPacketExtractor::closeDevice() {
|
bool PIPacketExtractor::closeDevice() {
|
||||||
if (dev) return dev->close();
|
if (dev) {
|
||||||
|
if (dev->isOpened()) return dev->close();
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user