Merge pull request #410 from aws-lumberyard-dev/ly-sdk/phistere/LYN-2723-Merge

LYN-2723: Fixes issues with bad project or engine paths

Cherry-pick: 6ce7a6d30c57c941459b43c157861df5d9143ae1

Code/Framework/AzFramework/AzFramework/Application/Application.cpp

@@ -175,7 +175,7 @@ namespace AzFramework
         }
 
         // Initializes the IArchive for reading archive(.pak) files
-        if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); !archive)
+        if (auto archive = AZ::Interface<AZ::IO::IArchive>::Get(); archive == nullptr)
         {
             m_archive = AZStd::make_unique<AZ::IO::Archive>();
             AZ::Interface<AZ::IO::IArchive>::Register(m_archive.get());
@@ -189,6 +189,12 @@ namespace AzFramework
             SetFileIOAliases();
         }
 
+        if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI == nullptr)
+        {
+            m_nativeUI = AZStd::make_unique<AZ::NativeUI::NativeUISystem>();
+            AZ::Interface<AZ::NativeUI::NativeUIRequests>::Register(m_nativeUI.get());
+        }
+
         ApplicationRequests::Bus::Handler::BusConnect();
         AZ::UserSettingsFileLocatorBus::Handler::BusConnect();
         NetSystemRequestBus::Handler::BusConnect();
@@ -205,12 +211,17 @@ namespace AzFramework
         AZ::UserSettingsFileLocatorBus::Handler::BusDisconnect();
         ApplicationRequests::Bus::Handler::BusDisconnect();
 
+        if (AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get() == m_nativeUI.get())
+        {
+            AZ::Interface<AZ::NativeUI::NativeUIRequests>::Unregister(m_nativeUI.get());
+        }
+        m_nativeUI.reset();
+
         // Unset the Archive file IO if it is set as the direct instance
         if (AZ::IO::FileIOBase::GetInstance() == m_archiveFileIO.get())
         {
             AZ::IO::FileIOBase::SetInstance(nullptr);
         }
-
         m_archiveFileIO.reset();
 
         // Destroy the IArchive instance
@@ -303,7 +314,6 @@ namespace AzFramework
             azrtti_typeid<AZ::AssetManagerComponent>(),
             azrtti_typeid<AZ::UserSettingsComponent>(),
             azrtti_typeid<AZ::Debug::FrameProfilerComponent>(),
-            azrtti_typeid<AZ::NativeUI::NativeUISystemComponent>(),
             azrtti_typeid<AZ::SliceComponent>(),
             azrtti_typeid<AZ::SliceSystemComponent>(),
 
@@ -372,7 +382,6 @@ namespace AzFramework
             azrtti_typeid<AZ::UserSettingsComponent>(),
             azrtti_typeid<AZ::ScriptSystemComponent>(),
             azrtti_typeid<AZ::JobManagerComponent>(),
-            azrtti_typeid<AZ::NativeUI::NativeUISystemComponent>(),
             azrtti_typeid<AZ::SliceSystemComponent>(),
 
             azrtti_typeid<AzFramework::AssetCatalogComponent>(),

Code/Framework/AzFramework/AzFramework/Application/Application.h

@@ -16,6 +16,7 @@
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/UserSettings/UserSettings.h>
 #include <AzCore/Math/Uuid.h>
+#include <AzCore/NativeUI/NativeUIRequests.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/string/fixed_string.h>
@@ -187,6 +188,7 @@ namespace AzFramework
         AZStd::unique_ptr<AZ::IO::FileIOBase> m_archiveFileIO; ///> The Default file IO instance is a ArchiveFileIO.
         AZStd::unique_ptr<AZ::IO::Archive> m_archive; ///> The AZ::IO::Instance
         AZStd::unique_ptr<Implementation> m_pimpl;
+        AZStd::unique_ptr<AZ::NativeUI::NativeUIRequests> m_nativeUI;
         bool m_ownsConsole = false;
 
         bool m_exitMainLoopRequested = false;

Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp

@@ -220,7 +220,7 @@ namespace AzFramework
             {
                 // Read the wait for connection boolean from the Settings Registry
                 AZ::s64 waitForConnect64{};
-                if (!AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, waitForConnect64, AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, AzFramework::AssetSystem::WaitForConnect))
+                if (AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, waitForConnect64, AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, AzFramework::AssetSystem::WaitForConnect))
                 {
                     outputConnectionSettings.m_waitForConnect = waitForConnect64 != 0;
                 }

Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp

@@ -41,9 +41,10 @@ namespace AzFramework::ProjectManager
             // at the end of the function
             AZ::CommandLine commandLine;
             commandLine.Parse(argc, argv);
-            AZ::SettingsRegistryImpl settingsRegistry;
-            // Store the Command line to the Setting Registry
+            AZ::SettingsRegistryMergeUtils::ParseCommandLine(commandLine);
 
+            // Store the Command line to the Setting Registry
+            AZ::SettingsRegistryImpl settingsRegistry;
             AZ::SettingsRegistryMergeUtils::StoreCommandLineToRegistry(settingsRegistry, commandLine);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
@@ -68,7 +69,14 @@ namespace AzFramework::ProjectManager
         // If we were able to locate a path to a project, we're done
         if (!projectRootPath.empty())
         {
-            return ProjectPathCheckResult::ProjectPathFound;
+            AZ::IO::FixedMaxPath projectJsonPath = engineRootPath / projectRootPath / "project.json";
+            if (AZ::IO::SystemFile::Exists(projectJsonPath.c_str()))
+            {
+                return ProjectPathCheckResult::ProjectPathFound;
+            }
+            AZ_TracePrintf(
+                "ProjectManager", "Did not find a project file at location '%s', launching the Project Manager...",
+                projectJsonPath.c_str());
         }
 
         if (LaunchProjectManager(engineRootPath))