From c7d3b025ada6692d159182bc42fbd9d1e844931f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Jul 2020 20:11:54 +0900
Subject: [PATCH] Rename variable and change default to true

---
 osu.Game/Configuration/OsuConfigManager.cs                    | 4 ++--
 .../Overlays/Settings/Sections/Gameplay/GeneralSettings.cs    | 2 +-
 osu.Game/Screens/Play/ComboEffects.cs                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 10d11f967e..268328272c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.PositionalHitSounds, true);
-            Set(OsuSetting.AlwaysPlayComboBreak, false);
+            Set(OsuSetting.AlwaysPlayFirstComboBreak, true);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             Set(OsuSetting.FloatingComments, false);
@@ -181,7 +181,7 @@ namespace osu.Game.Configuration
         ShowStoryboard,
         KeyOverlay,
         PositionalHitSounds,
-        AlwaysPlayComboBreak,
+        AlwaysPlayFirstComboBreak,
         ScoreMeter,
         FloatingComments,
         ShowInterface,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index f3534e4625..d79f1ba583 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Always play first combo break sound",
                     Keywords = new[] { "regardless", "combobreak.wav" },
-                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak)
+                    Bindable = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
                 },
                 new SettingsEnumDropdown<ScoreMeterType>
                 {
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index c56ee35cec..a836b6137e 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play
         private void load(OsuConfigManager config)
         {
             InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
-            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayComboBreak);
+            alwaysPlay = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak);
         }
 
         protected override void LoadComplete()