ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #458: Fix myThings() not being updated before thingRemoved in python plugins

pull/466/head
Jenkins nymea 2021-09-06 09:05:08 +02:00
parent 06b020fe5a 0e916ebbf7
commit f8645357b0
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.";
return nullptr;
}
plugin->m_mutex.lock();
PyObject* result = PyTuple_New(plugin->m_things.count());
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, [=](){
PyEval_RestoreThread(m_threadState);
m_things.remove(thing);
pyThing->thing = nullptr;
Py_DECREF(pyThing);
m_threadPool->setMaxThreadCount(m_threadPool->maxThreadCount() - 1);
@ -595,7 +594,7 @@ void PythonIntegrationPlugin::executeAction(ThingActionInfo *info)
void PythonIntegrationPlugin::thingRemoved(Thing *thing)
{
PyThing *pyThing = m_things.value(thing);
PyThing *pyThing = m_things.take(thing);
callPluginFunction("thingRemoved", reinterpret_cast<PyObject*>(pyThing));
}