lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-14 09:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only assign global m_DebugPy when initialisation is successful

Browse Source 
* Prevents use on other threads e.g. python status check while partially
  initialised.
This commit is contained in:
baldurk
2026-09-05 15:05:41 +01:00
parent ca7db72a5b
commit b6270982de
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+13 -9
View File
@@ -757,16 +757,16 @@ void PythonContext::GlobalInit(PersistentConfig &config)
Py_DecRef(str);
}
m_DebugPy = PyImport_ImportModule("debugpy");
PyObject *debugpy = PyImport_ImportModule("debugpy");
if(!m_DebugPy)
if(!debugpy)
{
qCritical() << "Failed to import debugpy";
HandleException(NULL);
}
else
{
PyObject *configure = PyObject_SafeGetAttrString(m_DebugPy, "configure");
PyObject *configure = PyObject_SafeGetAttrString(debugpy, "configure");
// don't let debugpy create a subprocess, for obvious reasons
if(configure)
@@ -779,8 +779,8 @@ void PythonContext::GlobalInit(PersistentConfig &config)
{
qCritical() << "Failed calling debugpy.configure";
HandleException(NULL);
Py_XDECREF(m_DebugPy);
m_DebugPy = NULL;
Py_XDECREF(debugpy);
debugpy = NULL;
}
Py_XDECREF(ret);
@@ -793,9 +793,9 @@ void PythonContext::GlobalInit(PersistentConfig &config)
Py_XDECREF(configure);
if(m_DebugPy)
if(debugpy)
{
PyObject *listen = PyObject_SafeGetAttrString(m_DebugPy, "listen");
PyObject *listen = PyObject_SafeGetAttrString(debugpy, "listen");
if(listen)
{
@@ -810,8 +810,12 @@ void PythonContext::GlobalInit(PersistentConfig &config)
{
qCritical() << "Failed calling debugpy.listen";
HandleException(NULL);
Py_XDECREF(m_DebugPy);
m_DebugPy = NULL;
Py_XDECREF(debugpy);
debugpy = NULL;
}
else
{
m_DebugPy = debugpy;
}
Py_XDECREF(ret);