Add back missing sample fallback to default skin

This commit is contained in:
Dean Herbert
2019-09-05 23:01:35 +09:00
parent 9d0151f19f
commit 0a6c42972c
2 changed files with 69 additions and 3 deletions

View File

@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.UI
private TextureStore textureStore;
private ISampleStore sampleStore;
private ISampleStore localSampleStore;
/// <summary>
/// The playfield.
@ -158,8 +158,8 @@ namespace osu.Game.Rulesets.UI
textureStore.AddStore(dependencies.Get<TextureStore>());
dependencies.Cache(textureStore);
sampleStore = dependencies.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, "Samples"));
dependencies.CacheAs(sampleStore);
localSampleStore = dependencies.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, "Samples"));
dependencies.CacheAs(new FallbackSampleStore(localSampleStore, dependencies.Get<ISampleStore>()));
}
onScreenDisplay = dependencies.Get<OnScreenDisplay>();
@ -334,6 +334,8 @@ namespace osu.Game.Rulesets.UI
{
base.Dispose(isDisposing);
localSampleStore?.Dispose();
if (Config != null)
{
onScreenDisplay?.StopTracking(this, Config);