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

added pointer checks

Browse Source
This commit is contained in:
nymea 2019-09-21 09:01:13 +02:00
parent fe37c50ff9
commit 53c9759439
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ws2812fx/devicepluginws2812fx.cpp
View File

@ -305,9 +305,11 @@ void DevicePluginWs2812fx::deviceRemoved(Device *device)
m_usedInterfaces.removeAll(device->paramValue(ws2812fxDeviceSerialPortParamTypeId).toString()); m_usedInterfaces.removeAll(device->paramValue(ws2812fxDeviceSerialPortParamTypeId).toString());
QSerialPort *serialPort = m_serialPorts.take(device); QSerialPort *serialPort = m_serialPorts.take(device);
serialPort->flush(); if(serialPort) {
serialPort->close(); serialPort->flush();
serialPort->deleteLater(); serialPort->close();
serialPort->deleteLater();
}
} }
if (myDevices().empty()) { if (myDevices().empty()) {
@ -320,6 +322,8 @@ void DevicePluginWs2812fx::onReadyRead()
{ {
QSerialPort *serialPort = static_cast<QSerialPort*>(sender()); QSerialPort *serialPort = static_cast<QSerialPort*>(sender());
Device *device = m_serialPorts.key(serialPort); Device *device = m_serialPorts.key(serialPort);
if (!device)
return;
QByteArray data; QByteArray data;
while (serialPort->canReadLine()) { while (serialPort->canReadLine()) {
@ -402,6 +406,8 @@ void DevicePluginWs2812fx::onSerialError(QSerialPort::SerialPortError error)
{ {
QSerialPort *serialPort = static_cast<QSerialPort*>(sender()); QSerialPort *serialPort = static_cast<QSerialPort*>(sender());
Device *device = m_serialPorts.key(serialPort); Device *device = m_serialPorts.key(serialPort);
if (!device)
return;
if (error != QSerialPort::NoError && serialPort->isOpen()) { if (error != QSerialPort::NoError && serialPort->isOpen()) {
qCCritical(dcWs2812fx()) << "Serial port error:" << error << serialPort->errorString(); qCCritical(dcWs2812fx()) << "Serial port error:" << error << serialPort->errorString();