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

Revert "Load DrawableLoungRooms asynchronously"

Browse Source 
This reverts commit 0b55bb6913fbf05ebb8ecadfe711084d6797efe0.
This commit is contained in:
Dean Herbert 2021-09-08 20:51:05 +09:00
parent 7ed995fbc5
commit 7941240a00
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
View File

@ -64,9 +64,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
protected override void LoadComplete() protected override void LoadComplete()
{ {
rooms.CollectionChanged += roomsChanged;
roomManager.RoomsUpdated += updateSorting; roomManager.RoomsUpdated += updateSorting;
rooms.CollectionChanged += roomsChanged;
rooms.BindTo(roomManager.Rooms); rooms.BindTo(roomManager.Rooms);
Filter?.BindValueChanged(criteria => applyFilterCriteria(criteria.NewValue), true); Filter?.BindValueChanged(criteria => applyFilterCriteria(criteria.NewValue), true);
@ -108,14 +108,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private void addRooms(IEnumerable<Room> rooms) private void addRooms(IEnumerable<Room> rooms)
{ {
LoadComponentsAsync(rooms.Select(room => foreach (var room in rooms)
new DrawableLoungeRoom(room) { SelectedRoom = { BindTarget = SelectedRoom } }), rooms => roomFlow.Add(new DrawableLoungeRoom(room) { SelectedRoom = { BindTarget = SelectedRoom } });
{
// check against rooms collection to ensure the room wasn't removed since this async load started.
roomFlow.AddRange(rooms.Where(r => this.rooms.Contains(r.Room)));
applyFilterCriteria(Filter?.Value); applyFilterCriteria(Filter?.Value);
});
} }
private void removeRooms(IEnumerable<Room> rooms) private void removeRooms(IEnumerable<Room> rooms)