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

Merge PR #309: Don't call thingRemoved() on the plugin in case of reconfiguring

Browse Source
This commit is contained in:
Jenkins nymea 2020-10-28 19:07:24 +01:00
commit db98f60556
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -402,9 +402,6 @@ ThingSetupInfo *ThingManagerImplementation::reconfigureThingInternal(Thing *thin
} }
ParamList finalParams = buildParams(thing->thingClass().paramTypes(), params); ParamList finalParams = buildParams(thing->thingClass().paramTypes(), params);
// first remove the thing in the plugin
plugin->thingRemoved(thing);
// mark setup as incomplete // mark setup as incomplete
thing->setSetupStatus(Thing::ThingSetupStatusInProgress, Thing::ThingErrorNoError); thing->setSetupStatus(Thing::ThingSetupStatusInProgress, Thing::ThingErrorNoError);

5
plugins/mock/integrationpluginmock.cpp
View File

@ -133,6 +133,11 @@ void IntegrationPluginMock::discoverThings(ThingDiscoveryInfo *info)
void IntegrationPluginMock::setupThing(ThingSetupInfo *info) void IntegrationPluginMock::setupThing(ThingSetupInfo *info)
{ {
if (info->thing()->thingClassId() == mockThingClassId || info->thing()->thingClassId() == autoMockThingClassId) { if (info->thing()->thingClassId() == mockThingClassId || info->thing()->thingClassId() == autoMockThingClassId) {
if (m_daemons.contains(info->thing())) {
// We already have a daemon, seem's we're reconfiguring
delete m_daemons.take(info->thing());
}
bool async = false; bool async = false;
bool broken = false; bool broken = false;
if (info->thing()->thingClassId() == mockThingClassId) { if (info->thing()->thingClassId() == mockThingClassId) {