birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug preventing undo function working correctly (#5937)

Browse Source 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
This commit is contained in:
tjmgd
2021-12-02 18:54:58 +00:00
committed by GitHub
parent 0842eae3a0
commit 11357fbf9f
1 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.cpp
+46 -1
View File
@@ -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;