h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 13:54:00 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-texture-loader-stores' into ios-hacks

Browse Source 
# Conflicts:
#	osu.Game/Beatmaps/BeatmapManager.cs
This commit is contained in:
Dean Herbert
2019-01-25 17:43:07 +09:00
Unverified
parent bdac20eeda 99d349c865
commit 88360dd6f3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Beatmaps/BeatmapManager.cs
+1 -1
View File
@@ -257,7 +257,7 @@ namespace osu.Game.Beatmaps
if (beatmapInfo.Metadata == null)
beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, new LargeTextureStore(host.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager);
WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager);
previous?.TransferTo(working);
osu.Game/Overlays/OnScreenDisplay.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace osu.Game.Overlays
if (configManager == null) throw new ArgumentNullException(nameof(configManager));
if (!trackedConfigManagers.TryGetValue((source, configManager), out var existing))
throw new InvalidOperationException($"{nameof(configManager)} is not registered.");
return;
existing.Unload();
existing.SettingChanged -= display;