h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 12:02:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into song-select-selection-fixes

Browse Source
This commit is contained in:
Dean Herbert 2017-05-17 23:17:10 +09:00 committed by GitHub
commit 25f217505e
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGameBase.cs
View File

@ -146,7 +146,7 @@ namespace osu.Game
{
base.LoadComplete();
AddInternal(ratioContainer = new RatioAdjust
base.Content.Add(ratioContainer = new RatioAdjust
{
Children = new Drawable[]
{

10
osu.Game/Overlays/ChatOverlay.cs
View File

@ -206,18 +206,12 @@ namespace osu.Game.Overlays
private long? lastMessageId;
private List<Channel> careChannels;
private readonly List<Channel> careChannels = new List<Channel>();
private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
private void initializeChannels()
{
currentChannelContainer.Clear();
loadedChannels.Clear();
careChannels = new List<Channel>();
SpriteText loading;
Add(loading = new OsuSpriteText
{
@ -232,8 +226,6 @@ namespace osu.Game.Overlays
ListChannelsRequest req = new ListChannelsRequest();
req.Success += delegate (List<Channel> channels)
{
Debug.Assert(careChannels.Count == 0);
Scheduler.Add(delegate
{
loading.FadeOut(100);