h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 09:02:58 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10414 from bdach/fix-current-time-button-crashes

Browse Source
This commit is contained in:
Dean Herbert 2020-10-08 11:27:36 +09:00 committed by GitHub
commit 5d55f00139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Edit/Timing/ControlPointTable.cs
View File

@ -113,7 +113,6 @@ namespace osu.Game.Screens.Edit.Timing
}; };
controlPoints = group.ControlPoints.GetBoundCopy(); controlPoints = group.ControlPoints.GetBoundCopy();
controlPoints.CollectionChanged += (_, __) => createChildren();
} }
[Resolved] [Resolved]
@ -125,6 +124,12 @@ namespace osu.Game.Screens.Edit.Timing
createChildren(); createChildren();
} }
protected override void LoadComplete()
{
base.LoadComplete();
controlPoints.CollectionChanged += (_, __) => createChildren();
}
private void createChildren() private void createChildren()
{ {
fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null); fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null);

3
osu.Game/Screens/Edit/Timing/GroupSection.cs
View File

@ -111,7 +111,8 @@ namespace osu.Game.Screens.Edit.Timing
foreach (var cp in currentGroupItems) foreach (var cp in currentGroupItems)
Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp); Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time); // the control point might not necessarily exist yet, if currentGroupItems was empty.
SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time, true);
changeHandler?.EndChange(); changeHandler?.EndChange();
} }