h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 19:45:06 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into working-beatmap-async-2

Browse Source
This commit is contained in:
Dan Balasescu 2017-11-22 18:32:47 +09:00 committed by GitHub
commit c7a6c90249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -109,7 +109,7 @@ namespace osu.Game
dependencies.Cache(this); dependencies.Cache(this);
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset); configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value); Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
Ruleset.ValueChanged += r => configRuleset.Value = r.ID ?? 0; Ruleset.ValueChanged += r => configRuleset.Value = r.ID ?? 0;
} }

2
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -224,8 +224,8 @@ namespace osu.Game.Rulesets.Scoring
OnNewJudgement(judgement); OnNewJudgement(judgement);
updateScore(); updateScore();
NotifyNewJudgement(judgement);
UpdateFailed(); UpdateFailed();
NotifyNewJudgement(judgement);
} }
protected void RemoveJudgement(Judgement judgement) protected void RemoveJudgement(Judgement judgement)