TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix python crash at loader.load_sync()

Browse Source
This commit is contained in:
David Rose 2011-09-09 17:16:40 +00:00
parent bd62ba4cb6
commit c6296add0b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dtool/src/dtoolutil/executionEnvironment.cxx
View File

@ -261,6 +261,12 @@ ns_get_environment_variable(const string &var) const {
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
// If we're running from Python code, read out sys.argv. // If we're running from Python code, read out sys.argv.
if (!ns_has_environment_variable("PANDA_INCOMPATIBLE_PYTHON") && Py_IsInitialized()) { if (!ns_has_environment_variable("PANDA_INCOMPATIBLE_PYTHON") && Py_IsInitialized()) {
// Since we might have gotten to this point from a function call
// marked BLOCKING, which releases the Python thread state, we
// have to temporarily re-establish our thread state in the
// Python interpreter.
PyGILState_STATE state = PyGILState_Ensure();
Filename main_dir; Filename main_dir;
PyObject *obj = PySys_GetObject((char*) "argv"); // borrowed reference PyObject *obj = PySys_GetObject((char*) "argv"); // borrowed reference
if (obj != NULL && PyList_Check(obj)) { if (obj != NULL && PyList_Check(obj)) {
@ -273,6 +279,9 @@ ns_get_environment_variable(const string &var) const {
} }
} }
} }
PyGILState_Release(state);
if (main_dir.empty()) { if (main_dir.empty()) {
// We must be running in the Python interpreter directly, so return the CWD. // We must be running in the Python interpreter directly, so return the CWD.
return get_cwd().to_os_specific(); return get_cwd().to_os_specific();