Merge pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development

Merged `stabilization/2111RTE` to `development`

Code/Tools/ProjectManager/Source/Application.cpp

@@ -198,9 +198,7 @@ namespace O3DE::ProjectManager
             return true;
         }
 
-        bool forceRegistration = false;
-
-        // check if an engine with this name is already registered
+        // check if an engine with this name is already registered and has a valid engine.json
         auto existingEngineResult = m_pythonBindings->GetEngineInfo(engineInfo.m_name);
         if (existingEngineResult)
         {
@@ -232,10 +230,11 @@ namespace O3DE::ProjectManager
                 // user elected not to change the name or force registration
                 return false;
             }
-
-            forceRegistration = true;
         }
 
+        // always force register in case there is an engine registered in o3de_manifest.json, but
+        // the engine.json is missing or corrupt in which case GetEngineInfo() fails
+        constexpr bool forceRegistration = true;
         auto registerOutcome = m_pythonBindings->SetEngineInfo(engineInfo, forceRegistration);
         if (!registerOutcome)
         {

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -459,6 +459,9 @@ namespace O3DE::ProjectManager
             if (!pybind11::isinstance<pybind11::none>(enginePathResult))
             {
                 engineInfo = EngineInfoFromPath(enginePathResult);
+
+                // it is possible an engine is registered in o3de_manifest.json but the engine.json is
+                // missing or corrupt in which case we do not consider it a registered engine
             }
         });