From a3287b8cf2e3734e606b20490c9f2f8d5ab4a962 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 May 2018 21:45:05 +0900
Subject: [PATCH] Correctly rollback failed imports

---
 osu.Game/Database/ArchiveModelManager.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 28c25c873f..86af2fd0ed 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -58,13 +58,20 @@ namespace osu.Game.Database
 
         private readonly List<Action> cachedEvents = new List<Action>();
 
+        /// <summary>
+        /// Allows delaying of outwards events until an operation is confirmed (at a database level).
+        /// </summary>
         private bool delayingEvents;
 
-        private void cacheEvents()
-        {
-            delayingEvents = true;
-        }
+        /// <summary>
+        /// Begin delaying outwards events.
+        /// </summary>
+        private void delayEvents() => delayingEvents = true;
 
+        /// <summary>
+        /// Flush delayed events and disable delaying.
+        /// </summary>
+        /// <param name="perform">Whether the flushed events should be performed.</param>
         private void flushEvents(bool perform)
         {
             if (perform)
@@ -167,8 +174,8 @@ namespace osu.Game.Database
         /// <param name="archive">The archive to be imported.</param>
         public TModel Import(ArchiveReader archive)
         {
-            TModel item = null;
-            cacheEvents();
+            TModel item;
+            delayEvents();
 
             try
             {
@@ -196,6 +203,7 @@ namespace osu.Game.Database
                 item = null;
             }
 
+            // we only want to flush events after we've confirmed the write context didn't have any errors.
             flushEvents(item != null);
             return item;
         }