From e23e2bd3485045eb079b4c69f71b5cdf50b98260 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 May 2018 13:37:52 +0900
Subject: [PATCH] Fix recycling never being performed due to incorrect ordering

---
 osu.Game/Database/DatabaseContextFactory.cs | 33 +++++++++++----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Database/DatabaseContextFactory.cs b/osu.Game/Database/DatabaseContextFactory.cs
index ec408456e3..f57246453e 100644
--- a/osu.Game/Database/DatabaseContextFactory.cs
+++ b/osu.Game/Database/DatabaseContextFactory.cs
@@ -64,24 +64,25 @@ namespace osu.Game.Database
                 currentWriteDidWrite |= usage.PerformedWrite;
                 currentWriteDidError |= usage.Errors.Any();
 
-                if (usages > 0) return;
-
-                if (currentWriteDidError)
-                    currentWriteTransaction?.Rollback();
-                else
-                    currentWriteTransaction?.Commit();
-
-                currentWriteTransaction = null;
-                currentWriteDidWrite = false;
-                currentWriteDidError = false;
-
-                if (currentWriteDidWrite)
+                if (usages == 0)
                 {
-                    // explicitly dispose to ensure any outstanding flushes happen as soon as possible (and underlying resources are purged).
-                    usage.Context.Dispose();
+                    if (currentWriteDidError)
+                        currentWriteTransaction?.Rollback();
+                    else
+                        currentWriteTransaction?.Commit();
 
-                    // once all writes are complete, we want to refresh thread-specific contexts to make sure they don't have stale local caches.
-                    recycleThreadContexts();
+                    if (currentWriteDidWrite || currentWriteDidError)
+                    {
+                        // explicitly dispose to ensure any outstanding flushes happen as soon as possible (and underlying resources are purged).
+                        usage.Context.Dispose();
+
+                        // once all writes are complete, we want to refresh thread-specific contexts to make sure they don't have stale local caches.
+                        recycleThreadContexts();
+                    }
+
+                    currentWriteTransaction = null;
+                    currentWriteDidWrite = false;
+                    currentWriteDidError = false;
                 }
             }
             finally