h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-25 15:52:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #31644 from peppy/fix-beatmap-offset-crash

Browse Source 
Fix potential crash when adjusting offset
This commit is contained in:
Bartłomiej Dach 2025-01-24 10:20:29 +01:00 committed by GitHub
commit 2f84aec88d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
View File

@ -121,7 +121,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
// At the point we reach here, it's not guaranteed that all realm writes have taken place (there may be some in-flight). // At the point we reach here, it's not guaranteed that all realm writes have taken place (there may be some in-flight).
// We are only aware of writes that originated from our own flow, so if we do see one that's active we can avoid handling the feedback value arriving. // We are only aware of writes that originated from our own flow, so if we do see one that's active we can avoid handling the feedback value arriving.
if (realmWriteTask == null) if (realmWriteTask == null)
{
Current.Disabled = false;
Current.Value = val; Current.Value = val;
Current.Disabled = allowOffsetAdjust;
}
if (realmWriteTask?.IsCompleted == true) if (realmWriteTask?.IsCompleted == true)
{ {
@ -134,15 +138,15 @@ namespace osu.Game.Screens.Play.PlayerSettings
ReferenceScore.BindValueChanged(scoreChanged, true); ReferenceScore.BindValueChanged(scoreChanged, true);
} }
// the last play graph is relative to the offset at the point of the last play, so we need to factor that out for some usages.
private double adjustmentSinceLastPlay => lastPlayBeatmapOffset - Current.Value;
private void currentChanged(ValueChangedEvent<double> offset) private void currentChanged(ValueChangedEvent<double> offset)
{ {
Scheduler.AddOnce(updateOffset); Scheduler.AddOnce(updateOffset);
void updateOffset() void updateOffset()
{ {
// the last play graph is relative to the offset at the point of the last play, so we need to factor that out.
double adjustmentSinceLastPlay = lastPlayBeatmapOffset - Current.Value;
// Negative is applied here because the play graph is considering a hit offset, not track (as we currently use for clocks). // Negative is applied here because the play graph is considering a hit offset, not track (as we currently use for clocks).
lastPlayGraph?.UpdateOffset(-adjustmentSinceLastPlay); lastPlayGraph?.UpdateOffset(-adjustmentSinceLastPlay);
@ -153,11 +157,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
return; return;
} }
if (useAverageButton != null)
{
useAverageButton.Enabled.Value = !Precision.AlmostEquals(lastPlayAverage, adjustmentSinceLastPlay, Current.Precision / 2);
}
realmWriteTask = realm.WriteAsync(r => realmWriteTask = realm.WriteAsync(r =>
{ {
var setInfo = r.Find<BeatmapSetInfo>(beatmap.Value.BeatmapSetInfo.ID); var setInfo = r.Find<BeatmapSetInfo>(beatmap.Value.BeatmapSetInfo.ID);
@ -245,10 +244,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
Text = BeatmapOffsetControlStrings.CalibrateUsingLastPlay, Text = BeatmapOffsetControlStrings.CalibrateUsingLastPlay,
Action = () => Action = () =>
{ {
if (Current.Disabled)
return;
Current.Value = lastPlayBeatmapOffset - lastPlayAverage; Current.Value = lastPlayBeatmapOffset - lastPlayAverage;
lastAppliedScore.Value = ReferenceScore.Value; lastAppliedScore.Value = ReferenceScore.Value;
}, },
Enabled = { Value = !Precision.AlmostEquals(lastPlayAverage, 0, Current.Precision / 2) }
}, },
globalOffsetText = new LinkFlowContainer globalOffsetText = new LinkFlowContainer
{ {
@ -277,7 +278,13 @@ namespace osu.Game.Screens.Play.PlayerSettings
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
Current.Disabled = !allowOffsetAdjust;
bool allow = allowOffsetAdjust;
if (useAverageButton != null)
useAverageButton.Enabled.Value = allow && !Precision.AlmostEquals(lastPlayAverage, adjustmentSinceLastPlay, Current.Precision / 2);
Current.Disabled = !allow;
} }
private bool allowOffsetAdjust private bool allowOffsetAdjust