ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-10-23 14:43:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed event connection

Browse Source
This commit is contained in:
Bernhard Trinnes 2018-06-13 23:58:19 +02:00
parent 499dd538ba
commit ce9f0c77b8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serialportcommander/devicepluginserialportcommander.cpp
View File

@ -197,7 +197,6 @@ void DevicePluginSerialPortCommander::deviceRemoved(Device *device)
serialPortCommander->removeInputDevice(device); serialPortCommander->removeInputDevice(device);
if (serialPortCommander->isEmpty()) { if (serialPortCommander->isEmpty()) {
m_serialPortCommanders.remove(interface); m_serialPortCommanders.remove(interface);
serialPortCommander->serialPort()->close();
serialPortCommander->deleteLater(); serialPortCommander->deleteLater();
} }
} }
@ -208,7 +207,6 @@ void DevicePluginSerialPortCommander::deviceRemoved(Device *device)
serialPortCommander->removeOutputDevice(); serialPortCommander->removeOutputDevice();
if (serialPortCommander->isEmpty()) { if (serialPortCommander->isEmpty()) {
m_serialPortCommanders.remove(interface); m_serialPortCommanders.remove(interface);
serialPortCommander->serialPort()->close();
serialPortCommander->deleteLater(); serialPortCommander->deleteLater();
} }
} }

4
serialportcommander/serialportcommander.cpp
View File

@ -45,7 +45,7 @@ void SerialPortCommander::addOutputDevice(Device* device)
void SerialPortCommander::removeOutputDevice() void SerialPortCommander::removeOutputDevice()
{ {
m_outputDevice = NULL; m_outputDevice = nullptr;
} }
@ -63,7 +63,7 @@ void SerialPortCommander::removeInputDevice(Device* device)
bool SerialPortCommander::isEmpty() bool SerialPortCommander::isEmpty()
{ {
return(!hasOutputDevice() || m_inputDevices.empty()); return(!hasOutputDevice() && m_inputDevices.empty());
} }