h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 13:33:03 +08:00
Code Issues Releases Wiki Activity

Fix event flushing sticking on early return

Browse Source
This commit is contained in:
Dean Herbert 2018-05-29 19:43:52 +09:00
parent 4a18951cce
commit 31ab6f2408
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Database/ArchiveModelManager.cs
View File

@ -174,7 +174,7 @@ namespace osu.Game.Database
/// <param name="archive">The archive to be imported.</param> /// <param name="archive">The archive to be imported.</param>
public TModel Import(ArchiveReader archive) public TModel Import(ArchiveReader archive)
{ {
TModel item; TModel item = null;
delayEvents(); delayEvents();
try try
@ -211,9 +211,12 @@ namespace osu.Game.Database
Logger.Error(e, $"Import of {archive.Name} failed and has been rolled back.", LoggingTarget.Database); Logger.Error(e, $"Import of {archive.Name} failed and has been rolled back.", LoggingTarget.Database);
item = null; item = null;
} }
finally
{
// we only want to flush events after we've confirmed the write context didn't have any errors. // we only want to flush events after we've confirmed the write context didn't have any errors.
flushEvents(item != null); flushEvents(item != null);
}
return item; return item;
} }