mirror of
https://github.com/ppy/osu.git
synced 2024-11-15 03:47:26 +08:00
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
This commit is contained in:
commit
e785f1ddf1
@ -206,18 +206,12 @@ namespace osu.Game.Overlays
|
|||||||
|
|
||||||
private long? lastMessageId;
|
private long? lastMessageId;
|
||||||
|
|
||||||
private List<Channel> careChannels;
|
private List<Channel> careChannels = new List<Channel>();
|
||||||
|
|
||||||
private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
|
private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
|
||||||
|
|
||||||
private void initializeChannels()
|
private void initializeChannels()
|
||||||
{
|
{
|
||||||
currentChannelContainer.Clear();
|
|
||||||
|
|
||||||
loadedChannels.Clear();
|
|
||||||
|
|
||||||
careChannels = new List<Channel>();
|
|
||||||
|
|
||||||
SpriteText loading;
|
SpriteText loading;
|
||||||
Add(loading = new OsuSpriteText
|
Add(loading = new OsuSpriteText
|
||||||
{
|
{
|
||||||
@ -232,8 +226,6 @@ namespace osu.Game.Overlays
|
|||||||
ListChannelsRequest req = new ListChannelsRequest();
|
ListChannelsRequest req = new ListChannelsRequest();
|
||||||
req.Success += delegate (List<Channel> channels)
|
req.Success += delegate (List<Channel> channels)
|
||||||
{
|
{
|
||||||
Debug.Assert(careChannels.Count == 0);
|
|
||||||
|
|
||||||
Scheduler.Add(delegate
|
Scheduler.Add(delegate
|
||||||
{
|
{
|
||||||
loading.FadeOut(100);
|
loading.FadeOut(100);
|
||||||
|
Loading…
Reference in New Issue
Block a user