Merge remote-tracking branch 'origin/fix-simulation-device-removal'

This commit is contained in:
Jenkins 2018-06-25 20:27:21 +02:00
commit ee48fdf247

View File

@ -62,9 +62,12 @@ DeviceManager::DeviceSetupStatus DevicePluginSimulation::setupDevice(Device *dev
void DevicePluginSimulation::deviceRemoved(Device *device)
{
QTimer *t = m_simulationTimers.take(device);
t->stop();
t->deleteLater();
// Clean up any timers we may have for this device
if (m_simulationTimers.contains(device)) {
QTimer *t = m_simulationTimers.take(device);
t->stop();
t->deleteLater();
}
}
DeviceManager::DeviceError DevicePluginSimulation::executeAction(Device *device, const Action &action)