Fixes for AR issues

2021-05-07 11:26:59 -07:00
parent e8917e0f06
commit d2df379fa4
3 changed files with 27 additions and 14 deletions
@@ -526,6 +526,11 @@ namespace AZ
        // are destroyed
        m_commandLine = {};

+        m_entityAddedEvent.DisconnectAllHandlers();
+        m_entityRemovedEvent.DisconnectAllHandlers();
+        m_entityActivatedEvent.DisconnectAllHandlers();
+        m_entityDeactivatedEvent.DisconnectAllHandlers();
+
        DestroyAllocator();
    }

@@ -233,6 +233,14 @@ namespace AZ
            AZ_Assert(handler->m_event == this, "Entry event does not match");
            handler->Disconnect();
        }
+
+        // Free up any owned memory
+        AZStd::vector<Handler*> freeHandlers;
+        m_handlers.swap(freeHandlers);
+        AZStd::vector<Handler*> freeAdds;
+        m_addList.swap(freeAdds);
+        AZStd::stack<size_t> freeFree;
+        m_freeList.swap(freeFree);
    }