From a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77 Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:27:57 -0800
Subject: [PATCH] Prevent settings from being saved to setreg files on editor
 close. Limiting this to avoid a bigger blast radius. (#5717)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 Code/Editor/MainWindow.cpp |  2 +-
 Code/Editor/Settings.cpp   | 10 ++++++----
 Code/Editor/Settings.h     |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index 1c5b6c567a..e13a160bd6 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -519,7 +519,7 @@ MainWindow* MainWindow::instance()
 
 void MainWindow::closeEvent(QCloseEvent* event)
 {
-    gSettings.Save();
+    gSettings.Save(true);
 
     AzFramework::SystemCursorState currentCursorState;
     bool isInGameMode = false;
diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp
index d548cffb52..908e1c40f8 100644
--- a/Code/Editor/Settings.cpp
+++ b/Code/Editor/Settings.cpp
@@ -473,7 +473,7 @@ void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemC
 }
 
 //////////////////////////////////////////////////////////////////////////
-void SEditorSettings::Save()
+void SEditorSettings::Save(bool isEditorClosing)
 {
     QString strStringPlaceholder;
 
@@ -640,14 +640,16 @@ void SEditorSettings::Save()
     // --- Settings Registry values
 
     // Prefab System UI
-    AzFramework::ApplicationRequests::Bus::Broadcast(
-        &AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
+    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
 
     AzToolsFramework::Prefab::PrefabLoaderInterface* prefabLoaderInterface =
         AZ::Interface<AzToolsFramework::Prefab::PrefabLoaderInterface>::Get();
     prefabLoaderInterface->SetSaveAllPrefabsPreference(levelSaveSettings.saveAllPrefabsPreference);
 
-    SaveSettingsRegistryFile();
+    if (!isEditorClosing)
+    {
+        SaveSettingsRegistryFile();
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h
index 426d2300d3..f7617dd8c9 100644
--- a/Code/Editor/Settings.h
+++ b/Code/Editor/Settings.h
@@ -267,7 +267,7 @@ struct SANDBOX_API SEditorSettings
 AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     SEditorSettings();
     ~SEditorSettings() = default;
-    void    Save();
+    void    Save(bool isEditorClosing = false);
     void    Load();
     void    LoadCloudSettings();