From 285d92ff0d2e269ac3630b6149a3bb0106ff54be Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <59574542+imginimg@users.noreply.github.com>
Date: Thu, 16 Dec 2021 23:53:22 +0300
Subject: [PATCH] [AudioSystem] ACE bug fix: Ctrl-S doesn't work correctly when
 a level is loaded. (#6411)

Signed-off-by: Maxim Ivanov <imginimg@gmail.com>
---
 .../Editor/AudioControlsEditorMainWindow.ui   |  3 +++
 .../Editor/AudioControlsEditorWindow.cpp      | 21 -------------------
 .../Source/Editor/AudioControlsEditorWindow.h |  1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
index 8954bbc812..549e746de6 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
@@ -154,6 +154,9 @@
    <property name="text">
     <string>Save All</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
   <action name="actionReload">
    <property name="icon">
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
index 54a8ce616d..5f870d06d4 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
@@ -121,27 +121,6 @@ namespace AudioControls
         }
     }
 
-    //-------------------------------------------------------------------------------------------//
-    void CAudioControlsEditorWindow::keyPressEvent(QKeyEvent* pEvent)
-    {
-        if (pEvent->key() == Qt::Key_S && pEvent->modifiers() == Qt::ControlModifier)
-        {
-            Save();
-        }
-        else if (pEvent->key() == Qt::Key_Z && (pEvent->modifiers() & Qt::ControlModifier))
-        {
-            if (pEvent->modifiers() & Qt::ShiftModifier)
-            {
-                GetIEditor()->Redo();
-            }
-            else
-            {
-                GetIEditor()->Undo();
-            }
-        }
-        QMainWindow::keyPressEvent(pEvent);
-    }
-
     //-------------------------------------------------------------------------------------------//
     void CAudioControlsEditorWindow::closeEvent(QCloseEvent* pEvent)
     {
diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
index abe5fd4511..00ffabfbe9 100644
--- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
+++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
@@ -63,7 +63,6 @@ namespace AudioControls
         void Update();
 
     protected:
-        void keyPressEvent(QKeyEvent* pEvent) override;
         void closeEvent(QCloseEvent* pEvent) override;
 
     private: