From 1672ae268d48d30ed357b5898195bc4de8b16837 Mon Sep 17 00:00:00 2001
From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
Date: Thu, 9 Dec 2021 09:36:50 +0000
Subject: [PATCH] Add call to DisableSaveOnFinalize (#6242)

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
---
 .../Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
index 1fd70cb88c..fd65634d4e 100644
--- a/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
@@ -12,6 +12,7 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Debug/TraceMessageBus.h>
 #include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 #include <AzToolsFramework/Application/ToolsApplication.h>
@@ -63,6 +64,11 @@ namespace DisplaySettingsPythonBindingsUnitTests
 
             m_app.Start(appDesc);
             m_app.RegisterComponentDescriptor(AzToolsFramework::DisplaySettingsComponent::CreateDescriptor());
+
+            // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
+            // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash
+            // in the unit tests.
+            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
         }
 
         void TearDown() override