1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 04:12:57 +08:00

Merge branch 'master' into update-framework

This commit is contained in:
Salman Ahmed 2021-12-10 17:50:33 +03:00 committed by GitHub
commit 3a4266bd5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,6 +7,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Online.API; using osu.Game.Online.API;
@ -107,6 +108,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
public void AddOrUpdateRoom(Room room) public void AddOrUpdateRoom(Room room)
{ {
Debug.Assert(ThreadSafety.IsUpdateThread);
Debug.Assert(room.RoomID.Value != null); Debug.Assert(room.RoomID.Value != null);
if (ignoredRooms.Contains(room.RoomID.Value.Value)) if (ignoredRooms.Contains(room.RoomID.Value.Value))
@ -136,12 +138,16 @@ namespace osu.Game.Screens.OnlinePlay.Components
public void RemoveRoom(Room room) public void RemoveRoom(Room room)
{ {
Debug.Assert(ThreadSafety.IsUpdateThread);
rooms.Remove(room); rooms.Remove(room);
notifyRoomsUpdated(); notifyRoomsUpdated();
} }
public void ClearRooms() public void ClearRooms()
{ {
Debug.Assert(ThreadSafety.IsUpdateThread);
rooms.Clear(); rooms.Clear();
notifyRoomsUpdated(); notifyRoomsUpdated();
} }