Fixing initialization of LyShin and removing a macro and ISystemEventListner that were not doing anything

Code/CryEngine/CryCommon/CryMemoryManager.h

@@ -50,10 +50,6 @@
     #include <AzCore/Memory/OSAllocator.h> // memalign
 #endif // defined(APPLE)
 
-#ifndef STLALLOCATOR_CLEANUP
-#define STLALLOCATOR_CLEANUP
-#endif
-
 #define _CRY_DEFAULT_MALLOC_ALIGNMENT 4
 
 #if CRYMEMORYMANAGER_H_TRAIT_INCLUDE_MALLOC_H

Code/CryEngine/CrySystem/DllMain.cpp

@@ -90,7 +90,6 @@ public:
         case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
         {
             CryCleanup();
-            STLALLOCATOR_CLEANUP;
             gEnv->pSystem->SetThreadState(ESubsys_Physics, true);
             break;
         }

Code/CryEngine/CrySystem/SystemInit.cpp

@@ -1393,11 +1393,6 @@ bool CSystem::InitShine([[maybe_unused]] const SSystemInitParams& initParams)
 
     EBUS_EVENT(UiSystemBus, InitializeSystem);
 
-    if (!m_env.pLyShine)
-    {
-        AZ_Error(AZ_TRACE_SYSTEM_WINDOW, false, "LYShine System did not initialize correctly. Please check that the LyShine gem is enabled for this project in ProjectConfigurator.");
-        return false;
-    }
     return true;
 }
 

Code/CryEngine/CrySystem/XML/XmlUtils.cpp

@@ -272,7 +272,6 @@ void CXmlUtils::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wpar
     case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
     case ESYSTEM_EVENT_LEVEL_LOAD_END:
         g_pCXmlNode_PoolAlloc->FreeMemoryIfEmpty();
-        STLALLOCATOR_CLEANUP;
         break;
     }
 }

Gems/LyShine/Code/Source/LyShineSystemComponent.cpp

@@ -56,26 +56,6 @@
 #include "UiDynamicScrollBoxComponent.h"
 #include "UiNavigationSettings.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-struct CSystemEventListener_UI
-    : public ISystemEventListener
-{
-public:
-    virtual void OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
-    {
-        switch (event)
-        {
-        case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
-        {
-            STLALLOCATOR_CLEANUP;
-            break;
-        }
-        }
-    }
-};
-static CSystemEventListener_UI g_system_event_listener_ui;
-
-
 namespace LyShine
 {
     const AZStd::list<AZ::ComponentDescriptor*>* LyShineSystemComponent::m_componentDescriptors = nullptr;
@@ -228,11 +208,6 @@ namespace LyShine
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     void LyShineSystemComponent::InitializeSystem()
     {
-        // Not sure if this is still required
-        gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(&g_system_event_listener_ui);
-
-        m_pLyShine = new CLyShine(gEnv->pSystem);
-        gEnv->pLyShine = m_pLyShine;
         BroadcastCursorImagePathname();
     }
 
@@ -397,6 +372,25 @@ namespace LyShine
         }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    void LyShineSystemComponent::OnCrySystemInitialized(ISystem& system, [[maybe_unused]] const SSystemInitParams& startupParams)
+    {
+#if !defined(AZ_MONOLITHIC_BUILD)
+        // When module is linked dynamically, we must set our gEnv pointer.
+        // When module is linked statically, we'll share the application's gEnv pointer.
+        gEnv = system.GetGlobalEnvironment();
+#endif
+        m_pLyShine = new CLyShine(gEnv->pSystem);
+        gEnv->pLyShine = m_pLyShine;
+    }
+
+    void LyShineSystemComponent::OnCrySystemShutdown([[maybe_unused]] ISystem& system)
+    {
+        gEnv->pLyShine = nullptr;
+        delete m_pLyShine;
+        m_pLyShine = nullptr;       
+    }
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     void LyShineSystemComponent::BroadcastCursorImagePathname()
     {

Gems/LyShine/Code/Source/LyShineSystemComponent.h

@@ -38,6 +38,7 @@ namespace LyShine
         , protected UiSystemToolsBus::Handler
         , protected LyShineAllocatorScope
         , protected UiFrameworkBus::Handler
+        , protected CrySystemEventBus::Handler
     {
     public:
         AZ_COMPONENT(LyShineSystemComponent, lyShineSystemComponentUuid);
@@ -89,6 +90,11 @@ namespace LyShine
         void HandleEditorOnlyEntities(const EntityList& exportSliceEntities, const EntityIdSet& editorOnlyEntityIds) override;
         ////////////////////////////////////////////////////////////////////////
 
+        // CrySystemEventBus ///////////////////////////////////////////////////////
+        void OnCrySystemInitialized(ISystem& system, const SSystemInitParams&) override;
+        virtual void OnCrySystemShutdown(ISystem&) override;
+        ////////////////////////////////////////////////////////////////////////////
+
         void BroadcastCursorImagePathname();
 
     protected:  // data

Gems/Maestro/Code/Source/MaestroSystemComponent.cpp

@@ -112,7 +112,6 @@ namespace Maestro
         {
             case ESYSTEM_EVENT_LEVEL_POST_UNLOAD:
             {
-                STLALLOCATOR_CLEANUP;
                 CLightAnimWrapper::ReconstructCache();
                 break;
             }