tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid UI hover/click sounds breaking client (#30067)

Browse Source 
fixes #29561
This commit is contained in:
Pieter-Jan Briers
2024-07-15 16:55:05 +02:00
committed by GitHub
parent eb3b2ae01a
commit c0593fb328
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Audio/AudioUIController.cs
View File

@@ -54,7 +54,7 @@ public sealed class AudioUIController : UIController
{ {
if (!string.IsNullOrEmpty(value)) if (!string.IsNullOrEmpty(value))
{ {
var resource = _cache.GetResource<AudioResource>(value); var resource = GetSoundOrFallback(value, CCVars.UIClickSound.DefaultValue);
var source = var source =
_audioManager.CreateAudioSource(resource); _audioManager.CreateAudioSource(resource);
@@ -77,7 +77,7 @@ public sealed class AudioUIController : UIController
{ {
if (!string.IsNullOrEmpty(value)) if (!string.IsNullOrEmpty(value))
{ {
var hoverResource = _cache.GetResource<AudioResource>(value); var hoverResource = GetSoundOrFallback(value, CCVars.UIHoverSound.DefaultValue);
var hoverSource = var hoverSource =
_audioManager.CreateAudioSource(hoverResource); _audioManager.CreateAudioSource(hoverResource);
@@ -95,4 +95,12 @@ public sealed class AudioUIController : UIController
UIManager.SetHoverSound(null); UIManager.SetHoverSound(null);
} }
} }
private AudioResource GetSoundOrFallback(string path, string fallback)
{
if (!_cache.TryGetResource(path, out AudioResource? resource))
return _cache.GetResource<AudioResource>(fallback);
return resource;
}
} }