From 9912e68c5966fcff4fa885625239d08448e03bc7 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Wed, 22 Sep 2021 11:19:13 -0500
Subject: [PATCH] reverting unneeded changes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../Code/Source/Application/AtomToolsApplication.cpp     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
index a949852b5e..13b9a2ba27 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
@@ -12,7 +12,6 @@
 #include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h>
 
-#include <AzCore/Component/TickBus.h>
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
@@ -183,8 +182,8 @@ namespace AtomToolsFramework
 
         LoadSettings();
 
-        AtomToolsMainWindowFactoryRequestBus::Broadcast(&AtomToolsMainWindowFactoryRequestBus::Handler::CreateMainWindow);
         AtomToolsMainWindowNotificationBus::Handler::BusConnect();
+        AtomToolsMainWindowFactoryRequestBus::Broadcast(&AtomToolsMainWindowFactoryRequestBus::Handler::CreateMainWindow);
 
         auto editorPythonEventsInterface = AZ::Interface<AzToolsFramework::EditorPythonEventsInterface>::Get();
         if (editorPythonEventsInterface)
@@ -195,9 +194,9 @@ namespace AtomToolsFramework
             editorPythonEventsInterface->StartPython();
         }
 
-        QTimer::singleShot(0, this, [this]() {
-            ProcessCommandLine(m_commandLine);
-        });
+        // Delay execution of commands and scripts post initialization
+        QTimer::singleShot(0, [this]() { ProcessCommandLine(m_commandLine); });
+
         m_timer.start();
     }