From e5dea02e2f969a7e680540238aa71a366299e267 Mon Sep 17 00:00:00 2001
From: ethan geller <Ethan.Geller@epicgames.com>
Date: Fri, 2 Aug 2019 22:33:19 -0400
Subject: [PATCH] #jira UE-78301 fix for bad cast on ReverbEffect. Bring in fix
 from Maxwell Hayes for UObject name collision. #rb mawell.hayes

#ROBOMERGE-SOURCE: CL 7711798 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7711799 by ethan geller in Main branch]
---
 .../Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp  | 2 +-
 .../Runtime/AudioMixer/Private/AudioMixerEffectsManager.cpp | 6 ++++--
 Engine/Source/Runtime/Engine/Private/AudioEffect.cpp        | 1 +
 Engine/Source/Runtime/Engine/Public/AudioEffect.h           | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
index 69b1b64ccf19..f4fa03d25d7a 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
@@ -685,7 +685,7 @@ namespace Audio
 				}
 				else
 				{
-					ReverbPreset = NewObject<USubmixEffectReverbFastPreset>(MasterReverbSoundSubmix, TEXT("Master Reverb Effect Preset"));
+					ReverbPreset = NewObject<USubmixEffectReverbFastPreset>(MasterReverbSoundSubmix, TEXT("Master Reverb Effect Fast Preset"));
 				}
 				
 				ReverbPreset->AddToRoot();
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerEffectsManager.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerEffectsManager.cpp
index 542213779e87..986da1d1562f 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerEffectsManager.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerEffectsManager.cpp
@@ -97,7 +97,9 @@ namespace Audio
 
 	FAudioMixerEffectsManager::FAudioMixerEffectsManager(FAudioDevice* InDevice)
 		: FAudioEffectsManager(InDevice)
-	{}
+	{
+		bUseLegacyReverb = GetDefault<UAudioSettings>()->bEnableLegacyReverb;
+	}
 
 	FAudioMixerEffectsManager::~FAudioMixerEffectsManager()
 	{}
@@ -115,7 +117,7 @@ namespace Audio
 			if (SoundEffectSubmix)
 			{
 				// Choose correct reverb based upon ini settings.
-				if (GetDefault<UAudioSettings>()->bEnableLegacyReverb)
+				if (bUseLegacyReverb)
 				{
 					FSubmixEffectReverb* SoundEffectReverb = static_cast<FSubmixEffectReverb*>(SoundEffectSubmix);
 					SoundEffectReverb->SetEffectParameters(ReverbEffectParameters);
diff --git a/Engine/Source/Runtime/Engine/Private/AudioEffect.cpp b/Engine/Source/Runtime/Engine/Private/AudioEffect.cpp
index b2b3bf560194..cdfae39434b8 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioEffect.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioEffect.cpp
@@ -252,6 +252,7 @@ FAudioEffectsManager::FAudioEffectsManager( FAudioDevice* InDevice )
 	, bEQActive(false)
 	, bReverbChanged(true) // Setting to true to catch the first default reverb setting
 	, bEQChanged(false)
+	, bUseLegacyReverb(false)
 {
 	InitAudioEffects();
 }
diff --git a/Engine/Source/Runtime/Engine/Public/AudioEffect.h b/Engine/Source/Runtime/Engine/Public/AudioEffect.h
index e15aa7fed650..e15396214fba 100644
--- a/Engine/Source/Runtime/Engine/Public/AudioEffect.h
+++ b/Engine/Source/Runtime/Engine/Public/AudioEffect.h
@@ -220,6 +220,7 @@ protected:
 	bool bEQActive;
 	bool bReverbChanged;
 	bool bEQChanged;
+	bool bUseLegacyReverb;
 };
 
 // end