Merge branch 'master' into results-dynamic-pp-calc

This commit is contained in:
Bartłomiej Dach
2020-10-19 21:41:07 +02:00
committed by GitHub
231 changed files with 4924 additions and 1741 deletions

View File

@ -376,8 +376,10 @@ namespace osu.Game
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
RulesetStore?.Dispose();
BeatmapManager?.Dispose();
LocalConfig?.Dispose();
contextFactory.FlushConnections();
}
@ -411,7 +413,7 @@ namespace osu.Game
public void Migrate(string path)
{
contextFactory.FlushConnections();
(Storage as OsuStorage)?.Migrate(path);
(Storage as OsuStorage)?.Migrate(Host.GetStorage(path));
}
}
}