Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes

More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
This commit is contained in:
amzn-mgwynn
2021-06-25 19:18:03 -04:00
committed by GitHub
17 changed files with 194 additions and 37 deletions
@@ -86,10 +86,12 @@ namespace EditorInternal
void EditorToolsApplication::StartCommon(AZ::Entity* systemEntity)
{
AzToolsFramework::ToolsApplication::StartCommon(systemEntity);
m_StartupAborted = m_moduleManager->m_quitRequested;
if (systemEntity->GetState() != AZ::Entity::State::Active)
{
m_StartupAborted = true;
return;
}
}
@@ -101,6 +103,7 @@ namespace EditorInternal
AzToolsFramework::ToolsApplication::Start({}, params);
if (IsStartupAborted() || !m_systemEntity)
{
AzToolsFramework::ToolsApplication::Stop();
return false;
}
return true;