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

Always return a non-null container for SkinComponentsContainerLookups

Browse Source
This commit is contained in:
Dean Herbert 2023-02-16 19:25:55 +09:00
parent 4cc6664dc7
commit 9685fb2114
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Skinning/LegacySkin.cs
View File

@ -347,7 +347,7 @@ namespace osu.Game.Skinning
switch (containerLookup.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.MainHUDComponents: case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container => return new DefaultSkinComponentsContainer(container =>
{ {
var score = container.OfType<LegacyScoreCounter>().FirstOrDefault(); var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault(); var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
@ -387,8 +387,6 @@ namespace osu.Game.Skinning
new BarHitErrorMeter(), new BarHitErrorMeter(),
} }
}; };
return skinnableTargetWrapper;
} }
return null; return null;

8
osu.Game/Skinning/SkinComponentsContainer.cs
View File

@ -66,10 +66,10 @@ namespace osu.Game.Skinning
components.Clear(); components.Clear();
ComponentsLoaded = false; ComponentsLoaded = false;
if (componentsContainer == null) content = componentsContainer ?? new Container
return; {
RelativeSizeAxes = Axes.Both
content = componentsContainer; };
cancellationSource?.Cancel(); cancellationSource?.Cancel();
cancellationSource = null; cancellationSource = null;