RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18343 from frenzibyte/waveform-test-beatmap-failure

Browse Source 
Fix `WaveformTestBeatmap`s potentially providing disposed track
This commit is contained in:
Dean Herbert 2022-05-22 21:21:28 +09:00 committed by GitHub
commit d84119ac06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/WaveformTestBeatmap.cs
View File

@ -59,6 +59,13 @@ namespace osu.Game.Tests
protected override Track GetBeatmapTrack() => trackStore.Get(firstAudioFile);
public override bool TryTransferTrack(WorkingBeatmap target)
{
// Our track comes from a local track store that's disposed on finalizer,
// therefore it's unsafe to transfer it to another working beatmap.
return false;
}
private string firstAudioFile
{
get

16
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -126,11 +126,19 @@ namespace osu.Game.Beatmaps
}
/// <summary>
/// Transfer a valid audio track into this working beatmap. Used as an optimisation to avoid reload / track swap
/// across difficulties in the same beatmap set.
/// Attempts to transfer the audio track to a target working beatmap, if valid for transferring.
/// Used as an optimisation to avoid reload / track swap across difficulties in the same beatmap set.
/// </summary>
/// <param name="track">The track to transfer.</param>
public void TransferTrack([NotNull] Track track) => this.track = track ?? throw new ArgumentNullException(nameof(track));
/// <param name="target">The target working beatmap to transfer this track to.</param>
/// <returns>Whether the track has been transferred to the <paramref name="target"/>.</returns>
public virtual bool TryTransferTrack([NotNull] WorkingBeatmap target)
{
if (BeatmapInfo?.AudioEquals(target.BeatmapInfo) != true || Track.IsDummyDevice)
return false;
target.track = Track;
return true;
}
/// <summary>
/// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.

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

@ -267,7 +267,7 @@ namespace osu.Game.Overlays
TrackChangeDirection direction = TrackChangeDirection.None;
bool audioEquals = newWorking?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
bool audioEquals = newWorking?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) == true;
if (current != null)
{
@ -290,15 +290,8 @@ namespace osu.Game.Overlays
current = newWorking;
if (!audioEquals || CurrentTrack.IsDummyDevice)
{
if (lastWorking == null || !lastWorking.TryTransferTrack(current))
changeTrack();
}
else
{
// transfer still valid track to new working beatmap
current.TransferTrack(lastWorking.Track);
}
TrackChanged?.Invoke(current, direction);

7
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -373,6 +373,13 @@ namespace osu.Game.Tests.Visual
protected override Track GetBeatmapTrack() => track;
public override bool TryTransferTrack(WorkingBeatmap target)
{
// Our track comes from a local track store that's disposed on finalizer,
// therefore it's unsafe to transfer it to another working beatmap.
return false;
}
public class TrackVirtualStore : AudioCollectionManager<Track>, ITrackStore
{
private readonly IFrameBasedClock referenceClock;