sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-18 03:57:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7876 from smoogipoo/fix-playlist-id

Browse Source 
Fix playlist items added with the wrong IDs
This commit is contained in:
Dean Herbert 2020-02-17 17:58:26 +09:00 committed by GitHub
commit cf973f7730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
View File

@ -134,6 +134,22 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2); AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2);
} }
[Test]
public void TestAddItemAfterRearrangement()
{
AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
AddStep("rearrange", () =>
{
var item = Room.Playlist[0];
Room.Playlist.RemoveAt(0);
Room.Playlist.Add(item);
});
AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
AddAssert("new item has id 2", () => Room.Playlist.Last().ID == 2);
}
private class TestMatchSongSelect : MatchSongSelect private class TestMatchSongSelect : MatchSongSelect
{ {
public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails; public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;

2
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
{ {
PlaylistItem item = new PlaylistItem PlaylistItem item = new PlaylistItem
{ {
ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0, ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
}; };
populateItemFromCurrent(item); populateItemFromCurrent(item);