Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main

LYN-2998 added protections around physx AZ::Events handlers that are connected/disconnected on selection events. fixed entities not being deselected when entering game mode in editor.
2021-04-21 11:09:32 +01:00
parent b95865b2d8 beafc80939
commit b0cb5a381b
3 changed files with 20 additions and 5 deletions
@@ -687,8 +687,14 @@ namespace PhysX
    {
        if (auto* physXSystem = GetPhysXSystem())
        {
-            physXSystem->RegisterSystemConfigurationChangedEvent(m_physXConfigChangedHandler);
-            physXSystem->RegisterOnDefaultMaterialLibraryChangedEventHandler(m_onDefaultMaterialLibraryChangedEventHandler);
+            if (!m_physXConfigChangedHandler.IsConnected())
+            {
+                physXSystem->RegisterSystemConfigurationChangedEvent(m_physXConfigChangedHandler);
+            }
+            if (!m_onDefaultMaterialLibraryChangedEventHandler.IsConnected())
+            {
+                physXSystem->RegisterOnDefaultMaterialLibraryChangedEventHandler(m_onDefaultMaterialLibraryChangedEventHandler);
+            }
        }
    }