From e7e85f91d6ca30dd6e3fb872b27a693e6e8f0816 Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <jillich@amazon.com>
Date: Wed, 2 Jun 2021 19:08:10 +0200
Subject: [PATCH] Addressing PR feedback

---
 Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp      | 1 -
 .../ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp   | 6 +++---
 Code/Tools/ProjectManager/Source/PythonBindings.cpp         | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
index 559141bc82..85e34aeced 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
@@ -92,7 +92,6 @@ namespace O3DE::ProjectManager
     void CreateProjectCtrl::HandleNextButton()
     {
         ScreenWidget* currentScreen = reinterpret_cast<ScreenWidget*>(m_stack->currentWidget());
-        const int currentScreenIndex = m_stack->currentIndex();
         ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
 
         if (screenEnum == ProjectManagerScreen::NewProjectSettings)
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 670cbbc5a3..aa36c1b0ab 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -89,7 +89,7 @@ namespace O3DE::ProjectManager
             });
     }
 
-    void GemCatalogScreen::FillModel(const QString& projectPath, [[maybe_unused]] bool isNewProject)
+    void GemCatalogScreen::FillModel(const QString& projectPath, bool isNewProject)
     {
         AZ::Outcome<QVector<GemInfo>, AZStd::string> allGemInfosResult;
         if (isNewProject)
@@ -133,12 +133,12 @@ namespace O3DE::ProjectManager
             }
             else
             {
-                QMessageBox::critical(nullptr, "Operation failed", QString("Cannot retrieve enabled gems for project %1.\n\nError:\n%2").arg(projectPath, enabledGemNamesResult.GetError().c_str()));
+                QMessageBox::critical(nullptr, tr("Operation failed"), QString("Cannot retrieve enabled gems for project %1.\n\nError:\n%2").arg(projectPath, enabledGemNamesResult.GetError().c_str()));
             }
         }
         else
         {
-            QMessageBox::critical(nullptr, "Operation failed", QString("Cannot retrieve gems for %1.\n\nError:\n%2").arg(projectPath, allGemInfosResult.GetError().c_str()));
+            QMessageBox::critical(nullptr, tr("Operation failed"), QString("Cannot retrieve gems for %1.\n\nError:\n%2").arg(projectPath, allGemInfosResult.GetError().c_str()));
         }
     }
 
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 72db92ff20..07edb1722f 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -321,13 +321,14 @@ namespace O3DE::ProjectManager
         try
         {
             executionCallback();
-            return AZ::Success();
         }
         catch ([[maybe_unused]] const std::exception& e)
         {
             AZ_Warning("PythonBindings", false, "Python exception %s", e.what());
             return AZ::Failure<AZStd::string>(e.what());
         }
+
+        return AZ::Success();
     }
 
     bool PythonBindings::ExecuteWithLock(AZStd::function<void()> executionCallback)