Revert changes that are to be resolved in #9002

This commit is contained in:
Craftplacer 2020-05-12 06:06:31 +02:00
parent 0d6f531183
commit 39c36998c9

View File

@ -90,7 +90,7 @@ namespace osu.Game
protected BackButton BackButton; protected BackButton BackButton;
protected SettingsOverlay Settings; protected SettingsPanel Settings;
private VolumeOverlay volume; private VolumeOverlay volume;
private OsuLogo osuLogo; private OsuLogo osuLogo;
@ -767,17 +767,11 @@ namespace osu.Game
private Task asyncLoadStream; private Task asyncLoadStream;
/// <summary>
/// Schedules loading the provided <paramref name="d"/> in a single file.
/// </summary>
/// <param name="d">The component to load.</param>
/// <param name="add">The method to invoke for adding the component.</param>
/// <param name="cache">Whether to cache the component as type <typeparamref name="T"/> into the game dependencies before any scheduling.</param>
private T 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)
dependencies.CacheAs(d); dependencies.Cache(d);
if (d is OverlayContainer overlay) if (d is OverlayContainer overlay)
overlays.Add(overlay); overlays.Add(overlay);