matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Device Emulation (contd.): Add check for duplicate/non-existing devices when deviceManager enumerates devices

Browse Source
This commit is contained in:
Srivats P 2016-03-07 18:42:14 +05:30
parent 11e9d0f6ef
commit 600bdc1946
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/devicemanager.cpp
View File

@ -467,6 +467,11 @@ void DeviceManager::enumerateDevices(
switch (oper) { switch (oper) {
case kAdd: case kAdd:
if (deviceList_.contains(dk.key())) {
qWarning("%s: error adding device %s (EEXIST)",
__FUNCTION__, qPrintable(dk.config()));
break;
}
device = new Device(this); device = new Device(this);
*device = dk; *device = dk;
deviceList_.insert(dk.key(), device); deviceList_.insert(dk.key(), device);
@ -478,6 +483,11 @@ void DeviceManager::enumerateDevices(
case kDelete: case kDelete:
device = deviceList_.take(dk.key()); device = deviceList_.take(dk.key());
if (!device) {
qWarning("%s: error deleting device %s (NOTFOUND)",
__FUNCTION__, qPrintable(dk.config()));
break;
}
qDebug("enumerate(del): %s", qPrintable(device->config())); qDebug("enumerate(del): %s", qPrintable(device->config()));
delete device; delete device;