RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into move-tooltip-text

This commit is contained in:
Dan Balasescu 2019-05-21 14:25:38 +09:00 committed by GitHub
parent bc962bf8f0 2cf43dc4d4
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.
using System;
@ -588,7 +588,7 @@ private void forwardLoggedErrorsToNotifications()
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
{
if (cache)
@ -636,6 +636,8 @@ private void loadComponentSingleFile<T>(T d, Action<T> add, bool cache = false)
}
});
});
return d;
}
public bool OnPressed(GlobalAction action)