RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whoops

This commit is contained in:
rdb 2009-07-24 09:02:35 +00:00
parent a457d59aae
commit 9f3b801c22
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,14 +214,17 @@ ns_get_environment_variable(const string &var) const {
} else if (var == "MAIN_DIR") {
#ifdef HAVE_PYTHON
// If we're running from Python code, read out sys.argv.
if (Py_IsInitialized() && PyObject* obj = PySys_GetObject((char*) "argv")) {
Filename main_dir (PyString_AsString(PyList_GetItem(obj, 0)));
if (main_dir.empty()) {
// We must be running in the Python interpreter directly, so return the CWD.
return get_cwd();
if (Py_IsInitialized()) {
PyObject* obj = PySys_GetObject((char*) "argv");
if (obj) {
Filename main_dir (PyString_AsString(PyList_GetItem(obj, 0)));
if (main_dir.empty()) {
// We must be running in the Python interpreter directly, so return the CWD.
return get_cwd();
}
main_dir.make_absolute();
return Filename(main_dir.get_dirname()).to_os_specific();
}
main_dir.make_absolute();
return Filename(main_dir.get_dirname()).to_os_specific();
}
#endif