From b38a7e6eb234eaea6dac28a224279818e0458ceb Mon Sep 17 00:00:00 2001 From: Saas Date: Thu, 18 Sep 2025 17:54:21 +0200 Subject: [PATCH 1/2] unify both "too many audio listeners"- warnings --- Source/Engine/Audio/AudioListener.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Audio/AudioListener.cpp b/Source/Engine/Audio/AudioListener.cpp index 1921bd373..99f4424ec 100644 --- a/Source/Engine/Audio/AudioListener.cpp +++ b/Source/Engine/Audio/AudioListener.cpp @@ -37,15 +37,14 @@ void AudioListener::OnEnable() { _prevPos = GetPosition(); _velocity = Vector3::Zero; + + ASSERT(!Audio::Listeners.Contains(this)); if (Audio::Listeners.Count() >= AUDIO_MAX_LISTENERS) { - LOG(Error, "Unsupported amount of the audio listeners!"); + LOG(Warning, "There is more than one Audio Listener active. Please make sure only exactly one is active at any given time."); } else { - ASSERT(!Audio::Listeners.Contains(this)); - if (Audio::Listeners.Count() > 0) - LOG(Warning, "There is more than one Audio Listener active. Please make sure only exactly one is active at any given time."); Audio::Listeners.Add(this); AudioBackend::Listener::Reset(); AudioBackend::Listener::TransformChanged(GetPosition(), GetOrientation()); From 217701ae05876407b7e7cebb2d47d7192ae1af34 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 3 Feb 2026 17:48:30 +0100 Subject: [PATCH 2/2] Adjust error in case we support more listeners #3686 --- Source/Engine/Audio/AudioListener.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Audio/AudioListener.cpp b/Source/Engine/Audio/AudioListener.cpp index 59975e33c..3151abafd 100644 --- a/Source/Engine/Audio/AudioListener.cpp +++ b/Source/Engine/Audio/AudioListener.cpp @@ -41,7 +41,10 @@ void AudioListener::OnEnable() ASSERT(!Audio::Listeners.Contains(this)); if (Audio::Listeners.Count() >= AUDIO_MAX_LISTENERS) { - LOG(Warning, "There is more than one Audio Listener active. Please make sure only exactly one is active at any given time."); + if IF_CONSTEXPR (AUDIO_MAX_LISTENERS == 1) + LOG(Warning, "There is more than one Audio Listener active. Please make sure only exactly one is active at any given time."); + else + LOG(Warning, "Too many Audio Listener active."); } else {