Merge branch 'master' into fix-disabled-set-crash

This commit is contained in:
Dan Balasescu
2019-03-05 17:25:13 +09:00
committed by GitHub
372 changed files with 3325 additions and 1072 deletions

View File

@ -68,6 +68,7 @@ namespace osu.Game.Database
Refresh(ref item);
if (item.DeletePending) return false;
item.DeletePending = true;
}
@ -86,6 +87,7 @@ namespace osu.Game.Database
Refresh(ref item, ConsumableItems);
if (!item.DeletePending) return false;
item.DeletePending = false;
}