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

Merge pull request #13511 from smoogipoo/fix-possible-nullref-2

Browse Source 
Fix possible nullref in difficulty recommender
This commit is contained in:
Dean Herbert 2021-06-16 15:20:45 +09:00 committed by GitHub
commit 68fa7d68cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Beatmaps/DifficultyRecommender.cs
View File

@ -101,10 +101,20 @@ namespace osu.Game.Beatmaps
/// Rulesets ordered descending by their respective recommended difficulties. /// Rulesets ordered descending by their respective recommended difficulties.
/// The currently selected ruleset will always be first. /// The currently selected ruleset will always be first.
/// </returns> /// </returns>
private IEnumerable<RulesetInfo> orderedRulesets => private IEnumerable<RulesetInfo> orderedRulesets
recommendedDifficultyMapping {
.OrderByDescending(pair => pair.Value).Select(pair => pair.Key).Where(r => !r.Equals(ruleset.Value)) get
.Prepend(ruleset.Value); {
if (LoadState < LoadState.Ready || ruleset.Value == null)
return Enumerable.Empty<RulesetInfo>();
return recommendedDifficultyMapping
.OrderByDescending(pair => pair.Value)
.Select(pair => pair.Key)
.Where(r => !r.Equals(ruleset.Value))
.Prepend(ruleset.Value);
}
}
private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() => private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
{ {

2
osu.Game/OsuGame.cs
View File

@ -715,7 +715,6 @@ namespace osu.Game
PostNotification = n => notifications.Post(n), PostNotification = n => notifications.Post(n),
}, Add, true); }, Add, true);
loadComponentSingleFile(difficultyRecommender, Add);
loadComponentSingleFile(stableImportManager, Add); loadComponentSingleFile(stableImportManager, Add);
loadComponentSingleFile(screenshotManager, Add); loadComponentSingleFile(screenshotManager, Add);
@ -758,6 +757,7 @@ namespace osu.Game
chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible; chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
Add(difficultyRecommender);
Add(externalLinkOpener = new ExternalLinkOpener()); Add(externalLinkOpener = new ExternalLinkOpener());
Add(new MusicKeyBindingHandler()); Add(new MusicKeyBindingHandler());