kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix possible crash in WrapperManager

Browse Source
This commit is contained in:
wmayer
2022-10-25 12:48:55 +02:00
parent f1c03bc233
commit 51698f6a4c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/PythonWrapper.cpp
View File

@@ -123,6 +123,7 @@ PyTypeObject** SbkPySide2_QtWidgetsTypes=nullptr;
#endif
#include <App/Application.h>
#include <Base/Interpreter.h>
#include <Base/Quantity.h>
#include <Base/QuantityPy.h>
@@ -236,7 +237,7 @@ namespace Gui {
*/
class WrapperManager : public QObject
{
std::unordered_map<QObject*, std::list<PyObject*>> wrappers;
std::unordered_map<QObject*, std::list<Py::Object>> wrappers;
public:
static WrapperManager& instance()
@@ -256,7 +257,7 @@ public:
QObject::connect(obj, &QObject::destroyed, this, &WrapperManager::destroyed);
}
wrappers[obj].push_back(pyobj);
wrappers[obj].emplace_back(pyobj);
}
private:
@@ -271,8 +272,10 @@ private:
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
auto key = wrappers.find(obj);
if (key != wrappers.end()) {
Base::PyGILStateLocker lock;
for (auto it : key->second) {
Shiboken::Object::setValidCpp(reinterpret_cast<SbkObject*>(it), false);
auto value = it.ptr();
Shiboken::Object::setValidCpp(reinterpret_cast<SbkObject*>(value), false);
}
wrappers.erase(key);