Merge branch 'master' into non-null-beatmap

This commit is contained in:
Dean Herbert
2017-07-19 18:32:42 +09:00
committed by GitHub
3 changed files with 17 additions and 5 deletions

View File

@ -149,7 +149,11 @@ namespace osu.Game.Database
public void Import(params string[] paths)
{
foreach (string p in paths)
Import(p);
{
//In case the file was imported twice and deleted after the first time
if (File.Exists(p))
Import(p);
}
}
/// <summary>
@ -183,6 +187,8 @@ namespace osu.Game.Database
if (existing != null)
{
GetChildren(existing);
if (existing.DeletePending)
{
existing.DeletePending = false;