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

This commit is contained in:
Dan Balasescu
2017-11-22 18:32:47 +09:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@ namespace osu.Game
dependencies.Cache(this);
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;
}

View File

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