From 5061241992f69f1d2b0677de84941f13b6f80e44 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 9 Jun 2021 17:03:13 -0700
Subject: [PATCH] [cpack/stabilization/2106] early out if sys import fails in
 PythonBindings::StartPython

---
 Code/Tools/ProjectManager/Source/PythonBindings.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 824cab4758..bb6c05a472 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -278,8 +278,11 @@ namespace O3DE::ProjectManager
             pybind11::gil_scoped_acquire acquire;
 
             // sanity import check
-            int result = PyRun_SimpleString("import sys");
-            AZ_Error("ProjectManagerWindow", result != -1, "Import sys failed");
+            if (PyRun_SimpleString("import sys") != 0)
+            {
+                AZ_Assert(false, "Import sys failed");
+                return false;
+            }
 
             // import required modules
             m_cmake = pybind11::module::import("o3de.cmake");
@@ -293,7 +296,7 @@ namespace O3DE::ProjectManager
             // make sure the engine is registered
             RegisterThisEngine();
 
-            return result == 0 && !PyErr_Occurred();
+            return !PyErr_Occurred();
         }
         catch ([[maybe_unused]] const std::exception& e)
         {