From e1f578c590788235640154dd825df2a1ade4e492 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Oct 2020 12:28:10 +0900
Subject: [PATCH] Change editor timing screen seek behaviour to only occur on
 clicking table rows

Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs |  9 ++++++++-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs      | 14 --------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index c8982b819a..64f9526816 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -177,6 +177,9 @@ namespace osu.Game.Screens.Edit.Timing
 
             private readonly Box hoveredBackground;
 
+            [Resolved]
+            private EditorClock clock { get; set; }
+
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
@@ -200,7 +203,11 @@ namespace osu.Game.Screens.Edit.Timing
                     },
                 };
 
-                Action = () => selectedGroup.Value = controlGroup;
+                Action = () =>
+                {
+                    selectedGroup.Value = controlGroup;
+                    clock.SeekTo(controlGroup.Time);
+                };
             }
 
             private Color4 colourHover;
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0796097186..f511382cde 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Timing
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
 
-        [Resolved]
-        private EditorClock clock { get; set; }
-
         public TimingScreen()
             : base(EditorScreenMode.Timing)
         {
@@ -48,17 +45,6 @@ namespace osu.Game.Screens.Edit.Timing
             }
         };
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            selectedGroup.BindValueChanged(selected =>
-            {
-                if (selected.NewValue != null)
-                    clock.SeekTo(selected.NewValue.Time);
-            });
-        }
-
         protected override void OnTimelineLoaded(TimelineArea timelineArea)
         {
             base.OnTimelineLoaded(timelineArea);