Merge pull request #31967 from peppy/fix-results-applause-sound-overload

Fix results screen applause playing too loud during multiplayer spectating
ppy · Feb 20, 2025 · 5d73af1 · 5d73af1
2 parents 97c69cf + a75ec75
commit 5d73af1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
@@ -128,8 +129,12 @@ public bool Mute
             get => mute;
             set
             {
+                if (mute == value)
+                    return;
+
                 mute = value;
                 volumeAdjustment.Value = value ? 0 : 1;
+                Logger.Log($"{(mute ? "muting" : "unmuting")} player {UserId}");
             }
         }
 

diff --git a/osu.Game/Screens/Play/KiaiGameplayFountains.cs b/osu.Game/Screens/Play/KiaiGameplayFountains.cs
@@ -5,7 +5,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Logging;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -317,6 +317,8 @@ public void PlayApplause(ScoreRank rank)
                 if (!this.IsCurrentScreen() || s != rankApplauseSound)
                     return;
 
+                AddInternal(rankApplauseSound);
+
                 rankApplauseSound.VolumeTo(applause_volume);
                 rankApplauseSound.Play();
             });