From 11357fbf9f88bf316879b60df6dccc66cb1b9f76 Mon Sep 17 00:00:00 2001
From: tjmgd <92784061+tjmgd@users.noreply.github.com>
Date: Thu, 2 Dec 2021 18:54:58 +0000
Subject: [PATCH] Fix for bug preventing undo function working correctly
 (#5937)

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
---
 .../Source/Editor/AudioControlsEditorUndo.cpp | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
index 062d14addf..311f8a98a0 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
@@ -11,7 +11,7 @@
 
 #include <ATLControlsModel.h>
 #include <AudioControlsEditorPlugin.h>
-
+#include <ImplementationManager.h>
 #include <QStandardItemModel>
 #include <QList>
 
@@ -273,6 +273,51 @@ namespace AudioControls
                 pControl->m_connectedControls = m_connectedControls;
                 pModel->OnControlModified(pControl);
 
+                auto& tmpConnectedControls1 =
+                    connectedControls.size() > m_connectedControls.size() ? connectedControls : m_connectedControls;
+                auto& tmpConnectedControls2 =
+                    connectedControls.size() > m_connectedControls.size() ? m_connectedControls : connectedControls;
+                for (auto& connection1 : tmpConnectedControls1)
+                {
+                    bool bCheck = true;
+                    for (auto& connection2 : tmpConnectedControls2)
+                    {
+                        if (connection1 == connection2)
+                        {
+                            bCheck = false;
+                            break;
+                        }
+                    }
+
+                    if (!bCheck)
+                    {
+                        continue;
+                    }
+
+                    if (IAudioSystemEditor* audioSystemImpl = CAudioControlsEditorPlugin::GetImplementationManager()->GetImplementation())
+                    {
+                        if (IAudioSystemControl* middlewareControl = audioSystemImpl->GetControl(connection1->GetID()))
+                        {
+                            if (connectedControls.size() > m_connectedControls.size())
+                            {
+                                audioSystemImpl->ConnectionRemoved(middlewareControl);
+                                pControl->SignalConnectionRemoved(middlewareControl);
+                            }
+                            else
+                            {
+                                TConnectionPtr connection =
+                                    audioSystemImpl->CreateConnectionToControl(pControl->GetType(), middlewareControl);
+                                if (connection)
+                                {
+                                    pControl->SignalConnectionAdded(middlewareControl);
+                                }
+                            }
+
+                            pControl->SignalControlModified();
+                        }
+                    }
+                }
+
                 m_name = name;
                 m_scope = scope;
                 m_isAutoLoad = isAutoLoad;