RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10334 from peppy/fix-editor-current-time-button-crash 

Protect "use current time" button against crash when no timing point is selected
This commit is contained in:
Bartłomiej Dach 2020-10-02 19:49:30 +02:00 committed by GitHub
parent b1e7a5113e dab50bff6f
commit 36dbb1b70a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ internal class GroupSection : CompositeDrawable
{
private LabelledTextBox textBox;
private TriangleButton button;
[Resolved]
protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
@ -52,7 +54,7 @@ private void load()
{
Label = "Time"
},
new TriangleButton
button = new TriangleButton
{
Text = "Use current time",
RelativeSizeAxes = Axes.X,
@ -82,18 +84,22 @@ private void load()
if (group.NewValue == null)
{
textBox.Text = string.Empty;
textBox.Current.Disabled = true;
button.Enabled.Value = false;
return;
}
textBox.Current.Disabled = false;
button.Enabled.Value = true;
textBox.Text = $"{group.NewValue.Time:n0}";
}, true);
}
private void changeSelectedGroupTime(in double time)
{
if (time == SelectedGroup.Value.Time)
if (SelectedGroup.Value == null || time == SelectedGroup.Value.Time)
return;
changeHandler?.BeginChange();