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

Resolve conflict issues

This commit is contained in:
Salman Ahmed 2021-06-22 20:38:24 +03:00
parent 896c1dc202
commit ee84364d7c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Skinning/RulesetSkinProvidingContainer.cs
View File

@ -51,7 +51,6 @@ public RulesetSkinProvidingContainer(Ruleset ruleset, IBeatmap beatmap, [CanBeNu
private AudioManager audio { get; set; } private AudioManager audio { get; set; }
[Resolved] [Resolved]
private SkinManager skinManager { get; set; }
private ISkinSource skinSource { get; set; } private ISkinSource skinSource { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -84,6 +83,8 @@ protected virtual void UpdateSkins()
break; break;
} }
} }
SkinSources.Add(new RulesetResourcesSkin(Ruleset, host, audio));
} }
protected ISkin GetLegacyRulesetTransformedSkin(ISkin legacySkin) protected ISkin GetLegacyRulesetTransformedSkin(ISkin legacySkin)
@ -102,9 +103,6 @@ protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);
SkinSources.Add(Ruleset.CreateLegacySkinProvider(skinManager.DefaultSkin, Beatmap));
SkinSources.Add(new RulesetResourcesSkin(Ruleset, host, audio));
if (skinSource != null) if (skinSource != null)
skinSource.SourceChanged -= OnSourceChanged; skinSource.SourceChanged -= OnSourceChanged;
} }