From 0842eae3a067b0e7a184b43a24303c4479596392 Mon Sep 17 00:00:00 2001
From: tjmgd <92784061+tjmgd@users.noreply.github.com>
Date: Thu, 2 Dec 2021 18:54:51 +0000
Subject: [PATCH] Fix for inappropriate data being used to calc position of
 audio listerner (#5941)

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
---
 .../Code/Source/Audio/AudioListenerComponent.cpp       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
index 05d8061856..7062f685c2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp
@@ -96,7 +96,7 @@ namespace LmbrCentral
         }
         else
         {
-            m_positionEntity = entityId;
+            m_currentPositionEntity = entityId;
         }
     }
 
@@ -221,26 +221,26 @@ namespace LmbrCentral
 
         if (rotationEntityId.IsValid())
         {
-            AZ::EntityBus::MultiHandler::BusConnect(rotationEntityId);
             m_currentRotationEntity = rotationEntityId;
+            AZ::EntityBus::MultiHandler::BusConnect(rotationEntityId);
         }
         else
         {
-            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
             m_currentRotationEntity = GetEntityId();
+            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
         }
 
         // Lastly, connect to the Entity used for Position
 
         if (positionEntityId.IsValid())
         {
-            AZ::EntityBus::MultiHandler::BusConnect(positionEntityId);
             m_currentPositionEntity = positionEntityId;
+            AZ::EntityBus::MultiHandler::BusConnect(positionEntityId);
         }
         else
         {
-            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
             m_currentPositionEntity = GetEntityId();
+            AZ::TransformNotificationBus::MultiHandler::BusConnect(GetEntityId());
         }
 
         // Do a fetch of the transforms to sync upon connecting.