Put serialized_items on the heap to prevent weird crashes on shutdown from the list being destructed before members in it

2 files changed, 1 insertions, 2 deletions

diff --git a/src/base.cpp b/src/base.cpp
index 18450ef90..e45e6365c 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -2,7 +2,7 @@
 #include "modules.h"
 
 std::vector<SerializableBase *> serialized_types;
-std::list<SerializableBase *> serialized_items;
+std::list<SerializableBase *> *serialized_items;
 
 void RegisterTypes()
 {
diff --git a/src/main.cpp b/src/main.cpp
index 4d812a322..279e9792a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -379,7 +379,6 @@ int main(int ac, char **av, char **envp)
 		ModuleManager::UnloadModule(m, NULL);
 
 	ModuleManager::CleanupRuntimeDirectory();
-	serialized_items.clear();
 
 #ifdef _WIN32
 	OnShutdown();