Merge branch 'master' into import-stable-scores

This commit is contained in:
Dean Herbert
2019-07-05 15:54:33 +09:00
committed by GitHub
4 changed files with 17 additions and 17 deletions

View File

@ -114,7 +114,8 @@ namespace osu.Game.Database
lock (imported)
{
imported.Add(model);
if (model != null)
imported.Add(model);
current++;
notification.Text = $"Imported {current} of {paths.Length} {HumanisedModelName}s";
@ -140,7 +141,7 @@ namespace osu.Game.Database
{
notification.CompletionText = imported.Count == 1
? $"Imported {imported.First()}!"
: $"Imported {current} {HumanisedModelName}s!";
: $"Imported {imported.Count} {HumanisedModelName}s!";
if (imported.Count > 0 && PresentImport != null)
{