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

Merge branch 'master' into improve-user-ratings-calculations

Browse Source
This commit is contained in:
Dean Herbert 2017-11-23 23:33:05 +09:00 committed by GitHub
commit 6ddefa5f8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Database/DatabaseBackedStore.cs
View File

@ -35,6 +35,7 @@ namespace osu.Game.Database
var id = obj.ID; var id = obj.ID;
obj = lookupSource?.SingleOrDefault(t => t.ID == id) ?? context.Find<T>(id); obj = lookupSource?.SingleOrDefault(t => t.ID == id) ?? context.Find<T>(id);
context.Entry(obj).Reload();
} }
/// <summary> /// <summary>

4
osu.Game/Screens/Select/SongSelect.cs
View File

@ -203,8 +203,8 @@ namespace osu.Game.Screens.Select
Push(new Editor()); Push(new Editor());
} }
private void onBeatmapRestored(BeatmapInfo b) => carousel.UpdateBeatmap(b); private void onBeatmapRestored(BeatmapInfo b) => Schedule(() => carousel.UpdateBeatmap(b));
private void onBeatmapHidden(BeatmapInfo b) => carousel.UpdateBeatmap(b); private void onBeatmapHidden(BeatmapInfo b) => Schedule(() => carousel.UpdateBeatmap(b));
private void carouselBeatmapsLoaded() private void carouselBeatmapsLoaded()
{ {