birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LuaIDE crash at startup caused by missing System Allocator Initialization (#4130)

Browse Source 
Signed-off-by: Steve Pham <spham@amazon.com>
This commit is contained in:
Steve Pham
2021-09-15 08:32:52 -07:00
committed by GitHub
parent 77b17846b8
commit dc930a5987
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/Standalone/Source/Editor/LuaEditor.cpp
+8
View File
@@ -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();