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

Another fix for previous commit

Browse Source 
Merge should be fine now
This commit is contained in:
Hermann Detz 2020-11-18 15:49:16 +01:00 committed by Michael Zanetti
parent 0dfb894fcb
commit 11fe099825
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
idm/integrationpluginidm.cpp
View File

@ -172,8 +172,14 @@ void IntegrationPluginIdm::update(Thing *thing)
idm->onRequestStatus(); idm->onRequestStatus();
if (m_idmInfos.contains(thing)) { if (m_idmInfos.contains(thing)) {
<<<<<<< HEAD
ThingSetupInfo *info = m_idmInfos.take(thing); ThingSetupInfo *info = m_idmInfos.take(thing);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
=======
/* ThingSetupInfo *info = m_idmInfos.take(thing); */
/* qCDebug(dcIdm()) << "Finishing setup 4!"; */
/* info->finish(Thing::ThingErrorNoError); */
>>>>>>> 3b5ab5c... Another fix for previous commit
} }
} }
} }