From 57f1259a336163aac5439e34c88f5c7a1d35b8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 2 Sep 2024 10:49:31 +0200
Subject: [PATCH] Fix weirdness around spurious adjustments firing due to
 overloaded bindable

---
 osu.Game/Screens/Edit/Timing/TimingSection.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index e1567d65aa..e668120d0d 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -43,16 +44,16 @@ namespace osu.Game.Screens.Edit.Timing
                 if (!isRebinding) ChangeHandler?.SaveState();
             }
 
-            bpmTextEntry.Bindable.BindValueChanged(val =>
+            bpmTextEntry.OnCommit = (oldBeatLength, _) =>
             {
                 if (!Beatmap.AdjustNotesOnOffsetBPMChange.Value || ControlPoint.Value == null)
                     return;
 
                 Beatmap.BeginChange();
-                TimingSectionAdjustments.SetHitObjectBPM(Beatmap, ControlPoint.Value, val.OldValue);
+                TimingSectionAdjustments.SetHitObjectBPM(Beatmap, ControlPoint.Value, oldBeatLength);
                 Beatmap.UpdateAllHitObjects();
                 Beatmap.EndChange();
-            });
+            };
         }
 
         private bool isRebinding;
@@ -85,6 +86,8 @@ namespace osu.Game.Screens.Edit.Timing
 
         private partial class BPMTextBox : LabelledTextBox
         {
+            public new Action<double, double>? OnCommit { get; set; }
+
             private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
 
             public BPMTextBox()
@@ -92,10 +95,12 @@ namespace osu.Game.Screens.Edit.Timing
                 Label = "BPM";
                 SelectAllOnFocus = true;
 
-                OnCommit += (_, isNew) =>
+                base.OnCommit += (_, isNew) =>
                 {
                     if (!isNew) return;
 
+                    double oldBeatLength = beatLengthBindable.Value;
+
                     try
                     {
                         if (double.TryParse(Current.Value, out double doubleVal) && doubleVal > 0)
@@ -109,6 +114,7 @@ namespace osu.Game.Screens.Edit.Timing
                     // This is run regardless of parsing success as the parsed number may not actually trigger a change
                     // due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
                     beatLengthBindable.TriggerChange();
+                    OnCommit?.Invoke(oldBeatLength, beatLengthBindable.Value);
                 };
 
                 beatLengthBindable.BindValueChanged(val =>