Merge branch 'development' into cmake/SPEC-2513_w4267

Code/Editor/Controls/ConsoleSCB.cpp

@@ -338,6 +338,8 @@ CConsoleSCB::CConsoleSCB(QWidget* parent)
     connect(findPreviousAction, &QAction::triggered, this, &CConsoleSCB::findPrevious);
     ui->findPrevButton->addAction(findPreviousAction);
 
+    GetIEditor()->RegisterNotifyListener(this);
+
     connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
     connect(ui->findButton, &QPushButton::clicked, this, &CConsoleSCB::toggleConsoleSearch);
     connect(ui->textEdit, &ConsoleTextEdit::searchBarRequested, this, [this]
@@ -376,6 +378,8 @@ CConsoleSCB::~CConsoleSCB()
 {
     AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusDisconnect();
 
+    GetIEditor()->UnregisterNotifyListener(this);
+
     s_consoleSCB = nullptr;
     CLogFile::AttachEditBox(nullptr);
 }
@@ -1352,4 +1356,19 @@ CConsoleSCB* CConsoleSCB::GetCreatedInstance()
     return s_consoleSCB;
 }
 
+void CConsoleSCB::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+    switch (event)
+    {
+    case eNotify_OnBeginGameMode:
+        if (gSettings.clearConsoleOnGameModeStart)
+        {
+            ui->textEdit->clear();
+        }
+        break;
+    default:
+        break;
+    }
+}
+
 #include <Controls/moc_ConsoleSCB.cpp>

Code/Editor/Controls/ConsoleSCB.h

@@ -159,6 +159,7 @@ private:
 class CConsoleSCB
     : public QWidget
     , private AzToolsFramework::EditorPreferencesNotificationBus::Handler
+    , public IEditorNotifyListener
 {
     Q_OBJECT
 public:
@@ -187,6 +188,8 @@ private Q_SLOTS:
     void findNext();
 
 private:
+    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
     QScopedPointer<Ui::Console> ui;
     int m_richEditTextLength;