From dc930a5987af99e333e7f858a498faf682c045e7 Mon Sep 17 00:00:00 2001
From: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Date: Wed, 15 Sep 2021 08:32:52 -0700
Subject: [PATCH] Fix LuaIDE crash at startup caused by missing System
 Allocator Initialization (#4130)

Signed-off-by: Steve Pham <spham@amazon.com>
---
 Code/Tools/Standalone/Source/Editor/LuaEditor.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp b/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
index 89ab8207ff..f6d905515b 100644
--- a/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
+++ b/Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
@@ -35,6 +35,10 @@ int main(int argc, char* argv[])
         {
             AZ::AllocatorInstance<AZ::OSAllocator>::Create();
         }
+        if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
+        {
+            AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+        }
 
         AZStd::unique_ptr<AZ::IO::LocalFileIO> fileIO = AZStd::unique_ptr<AZ::IO::LocalFileIO>(aznew AZ::IO::LocalFileIO());
         AZ::IO::FileIOBase::SetInstance(fileIO.get());
@@ -70,6 +74,10 @@ int main(int argc, char* argv[])
         // if its in GUI mode or not.
     }
 
+    if (AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
+    {
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+    }
     if (AZ::AllocatorInstance<AZ::OSAllocator>::IsReady())
     {
         AZ::AllocatorInstance<AZ::OSAllocator>::Destroy();