sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-16 11:07:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix editor potentially using a track post-disposal

Browse Source 
This changes the editor to track the current track as it is *loaded* by
`MusicController`, rather than haphazardly following the current global
`WorkingBeatmap` (with a potentially unloaded track) or relying on local
immediate-load behaviour (as implemented in `ResourcesSection`).
This commit is contained in:
Dean Herbert 2022-08-01 16:30:45 +09:00
parent 2519706ad6
commit 2f60f91a0e
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/MusicController.cs
View File

@ -70,7 +70,11 @@ namespace osu.Game.Overlays
/// <summary> /// <summary>
/// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk. /// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk.
/// </summary> /// </summary>
public void ReloadCurrentTrack() => changeTrack(); public void ReloadCurrentTrack()
{
changeTrack();
TrackChanged?.Invoke(current, TrackChangeDirection.None);
}
/// <summary> /// <summary>
/// Returns whether the beatmap track is playing. /// Returns whether the beatmap track is playing.

17
osu.Game/Screens/Edit/Editor.cs
View File

@ -329,6 +329,9 @@ namespace osu.Game.Screens.Edit
changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true); changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
} }
[Resolved]
private MusicController musicController { get; set; }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
@ -336,12 +339,18 @@ namespace osu.Game.Screens.Edit
Mode.Value = isNewBeatmap ? EditorScreenMode.SongSetup : EditorScreenMode.Compose; Mode.Value = isNewBeatmap ? EditorScreenMode.SongSetup : EditorScreenMode.Compose;
Mode.BindValueChanged(onModeChanged, true); Mode.BindValueChanged(onModeChanged, true);
musicController.TrackChanged += onTrackChanged;
} }
/// <summary> protected override void Dispose(bool isDisposing)
/// If the beatmap's track has changed, this method must be called to keep the editor in a valid state. {
/// </summary> base.Dispose(isDisposing);
public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
musicController.TrackChanged -= onTrackChanged;
}
private void onTrackChanged(WorkingBeatmap working, TrackChangeDirection direction) => clock.ChangeSource(working.Track);
/// <summary> /// <summary>
/// Creates an <see cref="EditorState"/> instance representing the current state of the editor. /// Creates an <see cref="EditorState"/> instance representing the current state of the editor.

2
osu.Game/Screens/Edit/Setup/ResourcesSection.cs
View File

@ -118,8 +118,6 @@ namespace osu.Game.Screens.Edit.Setup
working.Value.Metadata.AudioFile = destination.Name; working.Value.Metadata.AudioFile = destination.Name;
music.ReloadCurrentTrack(); music.ReloadCurrentTrack();
editor?.UpdateClockSource();
return true; return true;
} }