sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Ensure proper closure of the heartbeat thread on reopen

Browse Source
This commit is contained in:
Paul Hollinsky
2020-09-01 15:52:41 -04:00
parent c48995520f
commit 046e2bae9d
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/device.h
+1 -8
View File
@@ -27,13 +27,7 @@ namespace icsneo {
class Device {
public:
virtual ~Device() {
if(isMessagePollingEnabled())
disableMessagePolling();
close();
if(heartbeatThread.joinable())
heartbeatThread.join();
}
virtual ~Device();
static std::string SerialNumToString(uint32_t serial);
static uint32_t SerialStringToNum(const std::string& serial);
@@ -103,7 +97,6 @@ protected:
bool online = false;
int messagePollingCallbackID = 0;
int internalHandlerCallbackID = 0;
int messageReceivedCallbackID = 0;
device_eventhandler_t report;
// START Initialization Functions