ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #232: Don't emit EventEmitted for invalid devices

Browse Source
This commit is contained in:
Jenkins nymea 2019-12-01 00:05:00 +01:00
commit a9c304b5f8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-core/devices/devicemanagerimplementation.cpp
View File

@ -1483,7 +1483,7 @@ void DeviceManagerImplementation::onEventTriggered(const Event &event)
// Doing some sanity checks here... // Doing some sanity checks here...
Device *device = m_configuredDevices.value(event.deviceId()); Device *device = m_configuredDevices.value(event.deviceId());
if (!device) { if (!device) {
qCWarning(dcDeviceManager()) << "Invalid device id in emitted event. Not forwarding event."; qCWarning(dcDeviceManager()) << "Invalid device id in emitted event. Not forwarding event. Device setup not complete yet?";
return; return;
} }
EventType eventType = device->deviceClass().eventTypes().findById(event.eventTypeId()); EventType eventType = device->deviceClass().eventTypes().findById(event.eventTypeId());
@ -1498,7 +1498,8 @@ void DeviceManagerImplementation::onEventTriggered(const Event &event)
void DeviceManagerImplementation::slotDeviceStateValueChanged(const StateTypeId &stateTypeId, const QVariant &value) void DeviceManagerImplementation::slotDeviceStateValueChanged(const StateTypeId &stateTypeId, const QVariant &value)
{ {
Device *device = qobject_cast<Device*>(sender()); Device *device = qobject_cast<Device*>(sender());
if (!device) { if (!device || !m_configuredDevices.contains(device->id())) {
qCWarning(dcDeviceManager()) << "Invalid device id in state change. Not forwarding event. Device setup not complete yet?";
return; return;
} }
emit deviceStateChanged(device, stateTypeId, value); emit deviceStateChanged(device, stateTypeId, value);