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

Fix myCount() not being updated before thingRemoved in python plugins

Browse Source
This commit is contained in:
Michael Zanetti 2021-08-25 00:54:32 +02:00
parent 685450fdb3
commit 0e916ebbf7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-core/integrations/pythonintegrationplugin.cpp
View File

@ -89,7 +89,7 @@ PyObject *PythonIntegrationPlugin::pyMyThings(PyObject *self, PyObject */*args*/
qCWarning(dcThingManager()) << "Cannot find plugin instance for this python module."; qCWarning(dcThingManager()) << "Cannot find plugin instance for this python module.";
return nullptr; return nullptr;
} }
plugin->m_mutex.lock(); plugin->m_mutex.lock();
PyObject* result = PyTuple_New(plugin->m_things.count()); PyObject* result = PyTuple_New(plugin->m_things.count());
for (int i = 0; i < plugin->m_things.count(); i++) { for (int i = 0; i < plugin->m_things.count(); i++) {
@ -540,7 +540,6 @@ void PythonIntegrationPlugin::setupThing(ThingSetupInfo *info)
connect(info->thing(), &Thing::destroyed, this, [=](){ connect(info->thing(), &Thing::destroyed, this, [=](){
PyEval_RestoreThread(m_threadState); PyEval_RestoreThread(m_threadState);
m_things.remove(thing);
pyThing->thing = nullptr; pyThing->thing = nullptr;
Py_DECREF(pyThing); Py_DECREF(pyThing);
m_threadPool->setMaxThreadCount(m_threadPool->maxThreadCount() - 1); m_threadPool->setMaxThreadCount(m_threadPool->maxThreadCount() - 1);
@ -595,7 +594,7 @@ void PythonIntegrationPlugin::executeAction(ThingActionInfo *info)
void PythonIntegrationPlugin::thingRemoved(Thing *thing) void PythonIntegrationPlugin::thingRemoved(Thing *thing)
{ {
PyThing *pyThing = m_things.value(thing); PyThing *pyThing = m_things.take(thing);
callPluginFunction("thingRemoved", reinterpret_cast<PyObject*>(pyThing)); callPluginFunction("thingRemoved", reinterpret_cast<PyObject*>(pyThing));
} }