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

Merge pull request #29534 from bdach/fix-divisor-crash

Browse Source 
Fix crash on attempting to edit particular beatmaps
This commit is contained in:
Dan Balasescu 2024-08-20 22:06:32 +09:00 committed by GitHub
commit 5bb94000d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -16,6 +16,7 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Legacy; using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Screens.Edit;
namespace osu.Game.Beatmaps.Formats namespace osu.Game.Beatmaps.Formats
{ {
@ -336,7 +337,7 @@ namespace osu.Game.Beatmaps.Formats
break; break;
case @"BeatDivisor": case @"BeatDivisor":
beatmap.BeatmapInfo.BeatDivisor = Parsing.ParseInt(pair.Value); beatmap.BeatmapInfo.BeatDivisor = Math.Clamp(Parsing.ParseInt(pair.Value), BindableBeatDivisor.MINIMUM_DIVISOR, BindableBeatDivisor.MAXIMUM_DIVISOR);
break; break;
case @"GridSize": case @"GridSize":

10
osu.Game/Screens/Edit/BindableBeatDivisor.cs
View File

@ -16,6 +16,9 @@ namespace osu.Game.Screens.Edit
{ {
public static readonly int[] PREDEFINED_DIVISORS = { 1, 2, 3, 4, 6, 8, 12, 16 }; public static readonly int[] PREDEFINED_DIVISORS = { 1, 2, 3, 4, 6, 8, 12, 16 };
public const int MINIMUM_DIVISOR = 1;
public const int MAXIMUM_DIVISOR = 64;
public Bindable<BeatDivisorPresetCollection> ValidDivisors { get; } = new Bindable<BeatDivisorPresetCollection>(BeatDivisorPresetCollection.COMMON); public Bindable<BeatDivisorPresetCollection> ValidDivisors { get; } = new Bindable<BeatDivisorPresetCollection>(BeatDivisorPresetCollection.COMMON);
public BindableBeatDivisor(int value = 1) public BindableBeatDivisor(int value = 1)
@ -30,8 +33,12 @@ namespace osu.Game.Screens.Edit
/// </summary> /// </summary>
/// <param name="divisor">The intended divisor.</param> /// <param name="divisor">The intended divisor.</param>
/// <param name="preferKnownPresets">Forces changing the valid divisors to a known preset.</param> /// <param name="preferKnownPresets">Forces changing the valid divisors to a known preset.</param>
public void SetArbitraryDivisor(int divisor, bool preferKnownPresets = false) /// <returns>Whether the divisor was successfully set.</returns>
public bool SetArbitraryDivisor(int divisor, bool preferKnownPresets = false)
{ {
if (divisor < MINIMUM_DIVISOR || divisor > MAXIMUM_DIVISOR)
return false;
// If the current valid divisor range doesn't contain the proposed value, attempt to find one which does. // If the current valid divisor range doesn't contain the proposed value, attempt to find one which does.
if (preferKnownPresets || !ValidDivisors.Value.Presets.Contains(divisor)) if (preferKnownPresets || !ValidDivisors.Value.Presets.Contains(divisor))
{ {
@ -44,6 +51,7 @@ namespace osu.Game.Screens.Edit
} }
Value = divisor; Value = divisor;
return true;
} }
private void updateBindableProperties() private void updateBindableProperties()

6
osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -330,14 +330,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void setPresetsFromTextBoxEntry() private void setPresetsFromTextBoxEntry()
{ {
if (!int.TryParse(divisorTextBox.Text, out int divisor) || divisor < 1 || divisor > 64) if (!int.TryParse(divisorTextBox.Text, out int divisor) || !BeatDivisor.SetArbitraryDivisor(divisor))
{ {
// the text either didn't parse as a divisor, or the divisor was not set due to being out of range.
// force a state update to reset the text box's value to the last sane value.
updateState(); updateState();
return; return;
} }
BeatDivisor.SetArbitraryDivisor(divisor);
this.HidePopover(); this.HidePopover();
} }