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

Don't cal thingRemoved() when a thing didn't complete the setup

Browse Source
This commit is contained in:
Michael Zanetti 2021-02-20 22:56:57 +01:00
parent 493b211eec
commit b2f9e911ad
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,6 +455,10 @@ ThingSetupInfo *ThingManagerImplementation::reconfigureThingInternal(Thing *thin
// try to setup the thing with the new params
ThingSetupInfo *info = new ThingSetupInfo(thing, this, 30000);
plugin->setupThing(info);
connect(info, &ThingSetupInfo::destroyed, thing, [=](){
m_pendingSetups.remove(thing->id());
});
connect(info, &ThingSetupInfo::finished, this, [this, info](){
if (info->status() != Thing::ThingErrorNoError) {
@ -775,8 +779,11 @@ Thing::ThingError ThingManagerImplementation::removeConfiguredThing(const ThingI
IntegrationPlugin *plugin = m_integrationPlugins.value(thing->pluginId());
if (!plugin) {
qCWarning(dcThingManager()).nospace() << "Plugin not loaded for thing " << thing->name() << ". Not calling thingRemoved on plugin.";
} else {
} else if (thing->setupStatus() == Thing::ThingSetupStatusComplete) {
plugin->thingRemoved(thing);
} else if (thing->setupStatus() == Thing::ThingSetupStatusInProgress) {
ThingSetupInfo *setupInfo = m_pendingSetups.value(thingId);
emit setupInfo->aborted();
}
thing->deleteLater();
@ -1989,6 +1996,11 @@ ThingSetupInfo* ThingManagerImplementation::setupThing(Thing *thing)
plugin->setupThing(info);
m_pendingSetups.insert(thing->id(), info);
connect(info, &ThingSetupInfo::destroyed, thing, [=](){
m_pendingSetups.remove(thing->id());
});
return info;
}

1
libnymea-core/integrations/thingmanagerimplementation.h
View File

@ -191,6 +191,7 @@ private:
QString thingName;
};
QHash<PairingTransactionId, PairingContext> m_pendingPairings;
QHash<ThingId, ThingSetupInfo*> m_pendingSetups;
QHash<IOConnectionId, IOConnection> m_ioConnections;