birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cpack/stabilization/2106] fixed startup crash in project manager from installer build

Browse Source
This commit is contained in:
scottr
2021-06-09 15:21:30 -07:00
parent 3c23f5fead
commit 2eefc08d2e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/ProjectManager/Source/PythonBindings.cpp
+4 -6
View File
@@ -246,7 +246,7 @@ namespace O3DE::ProjectManager
AZStd::string pyBasePath = Platform::GetPythonHomePath(PY_PACKAGE, m_enginePath.c_str());
if (!AZ::IO::SystemFile::Exists(pyBasePath.c_str()))
{
AZ_Warning("python", false, "Python home path must exist. path:%s", pyBasePath.c_str());
AZ_Assert(false, "Python home path must exist. path:%s", pyBasePath.c_str());
return false;
}
@@ -277,11 +277,9 @@ namespace O3DE::ProjectManager
AZStd::lock_guard<decltype(m_lock)> lock(m_lock);
pybind11::gil_scoped_acquire acquire;
// Setup sys.path
// sanity import check
int result = PyRun_SimpleString("import sys");
AZ_Warning("ProjectManagerWindow", result != -1, "Import sys failed");
result = PyRun_SimpleString(AZStd::string::format("sys.path.append('%s')", m_enginePath.c_str()).c_str());
AZ_Warning("ProjectManagerWindow", result != -1, "Append to sys path failed");
AZ_Error("ProjectManagerWindow", result != -1, "Import sys failed");
// import required modules
m_cmake = pybind11::module::import("o3de.cmake");
@@ -299,7 +297,7 @@ namespace O3DE::ProjectManager
}
catch ([[maybe_unused]] const std::exception& e)
{
AZ_Warning("ProjectManagerWindow", false, "Py_Initialize() failed with %s", e.what());
AZ_Assert(false, "Py_Initialize() failed with %s", e.what());
return false;
}
}