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

fixed device edit notification

Browse Source
This commit is contained in:
Simon Stürz 2015-05-06 16:55:35 +02:00 committed by Michael Zanetti
parent b6e253e5c2
commit 5d88998fa1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libguh/devicemanager.cpp
View File

@ -384,8 +384,8 @@ DeviceManager::DeviceError DeviceManager::editDevice(const DeviceId &deviceId, c
storeConfiguredDevices(); storeConfiguredDevices();
postSetupDevice(device); postSetupDevice(device);
device->setupCompleted(); device->setupCompleted();
emit deviceParamsChanged(device); emit deviceParamsChanged(device);
return DeviceErrorNoError; return DeviceErrorNoError;
} }
@ -858,7 +858,10 @@ void DeviceManager::slotDeviceSetupFinished(Device *device, DeviceManager::Devic
storeConfiguredDevices(); storeConfiguredDevices();
device->setupCompleted(); device->setupCompleted();
// TODO: recover old params.?? // TODO: recover old params.??
emit deviceParamsChanged(device);
emit deviceEditFinished(device, DeviceError::DeviceErrorSetupFailed); emit deviceEditFinished(device, DeviceError::DeviceErrorSetupFailed);
} }
qWarning() << QString("Error in device setup. Device %1 (%2) will not be functional.").arg(device->name()).arg(device->id().toString()); qWarning() << QString("Error in device setup. Device %1 (%2) will not be functional.").arg(device->name()).arg(device->id().toString());
@ -893,8 +896,8 @@ void DeviceManager::slotDeviceSetupFinished(Device *device, DeviceManager::Devic
m_asyncDeviceEdit.removeAll(device); m_asyncDeviceEdit.removeAll(device);
storeConfiguredDevices(); storeConfiguredDevices();
device->setupCompleted(); device->setupCompleted();
emit deviceEditFinished(device, DeviceManager::DeviceErrorNoError);
emit deviceParamsChanged(device); emit deviceParamsChanged(device);
emit deviceEditFinished(device, DeviceManager::DeviceErrorNoError);
return; return;
} }

1
server/guhcore.cpp
View File

@ -369,6 +369,7 @@ GuhCore::GuhCore(QObject *parent) :
connect(m_deviceManager, &DeviceManager::eventTriggered, this, &GuhCore::gotEvent); connect(m_deviceManager, &DeviceManager::eventTriggered, this, &GuhCore::gotEvent);
connect(m_deviceManager, &DeviceManager::deviceStateChanged, this, &GuhCore::deviceStateChanged); connect(m_deviceManager, &DeviceManager::deviceStateChanged, this, &GuhCore::deviceStateChanged);
connect(m_deviceManager, &DeviceManager::deviceAdded, this, &GuhCore::deviceAdded); connect(m_deviceManager, &DeviceManager::deviceAdded, this, &GuhCore::deviceAdded);
connect(m_deviceManager, &DeviceManager::deviceParamsChanged, this, &GuhCore::deviceParamsChanged);
connect(m_deviceManager, &DeviceManager::deviceRemoved, this, &GuhCore::deviceRemoved); connect(m_deviceManager, &DeviceManager::deviceRemoved, this, &GuhCore::deviceRemoved);
connect(m_deviceManager, &DeviceManager::actionExecutionFinished, this, &GuhCore::actionExecutionFinished); connect(m_deviceManager, &DeviceManager::actionExecutionFinished, this, &GuhCore::actionExecutionFinished);
connect(m_deviceManager, &DeviceManager::devicesDiscovered, this, &GuhCore::devicesDiscovered); connect(m_deviceManager, &DeviceManager::devicesDiscovered, this, &GuhCore::devicesDiscovered);