Python: Fix hang at application shutdown

garbear · garbear · commit 0f5db1a5aa52 · 2024-06-27T15:03:37.000-07:00
diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
@@ -57,7 +57,13 @@ XBPython::~XBPython()
 #if PY_VERSION_HEX >= 0x03070000
   if (Py_IsInitialized())
   {
+    // Switch to the main interpreter thread before finalizing
     PyThreadState_Swap(PyInterpreterState_ThreadHead(PyInterpreterState_Main()));
+
+    // Clear all loaded modules to prevent circular references
+    PyObject* modules = PyImport_GetModuleDict();
+    PyDict_Clear(modules);
+
     Py_Finalize();
   }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,13 @@ XBPython::~XBPython()`
`57`	`57`	`#if PY_VERSION_HEX >= 0x03070000`
`58`	`58`	`if (Py_IsInitialized())`
`59`	`59`	`{`
	`60`	`+ // Switch to the main interpreter thread before finalizing`
`60`	`61`	`PyThreadState_Swap(PyInterpreterState_ThreadHead(PyInterpreterState_Main()));`
	`62`	`+`
	`63`	`+ // Clear all loaded modules to prevent circular references`
	`64`	`+ PyObject* modules = PyImport_GetModuleDict();`
	`65`	`+ PyDict_Clear(modules);`
	`66`	`+`
`61`	`67`	`Py_Finalize();`
`62`	`68`	`}`
`63`	`69`	`#endif`