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

Merge branch 'master' into move-tooltip-text

Browse Source
This commit is contained in:
Dan Balasescu 2019-05-21 14:25:38 +09:00 committed by GitHub
commit de08bab0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/OsuGame.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
@ -588,7 +588,7 @@ namespace osu.Game
private Task asyncLoadStream; private Task asyncLoadStream;
private void loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false) private T loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
where T : Drawable where T : Drawable
{ {
if (cache) if (cache)
@ -636,6 +636,8 @@ namespace osu.Game
} }
}); });
}); });
return d;
} }
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)