From b0919722ac1c77fb484a7175e3f90cf325d03f9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Jan 2022 18:24:25 +0900
Subject: [PATCH] Guard against potential exception while blocking realm

---
 .../Sections/DebugSettings/MemorySettings.cs  | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
index f058c274e4..c5854981e6 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
@@ -1,11 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Localisation;
@@ -52,30 +54,38 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
 
             blockAction.Action = () =>
             {
-                var blocking = realmFactory.BlockAllOperations();
-                blockAction.Enabled.Value = false;
-
-                // As a safety measure, unblock after 10 seconds.
-                // This is to handle the case where a dev may block, but then something on the update thread
-                // accesses realm and blocks for eternity.
-                Task.Factory.StartNew(() =>
+                try
                 {
-                    Thread.Sleep(10000);
-                    unblock();
-                });
+                    var token = realmFactory.BlockAllOperations();
 
-                unblockAction.Action = unblock;
+                    blockAction.Enabled.Value = false;
 
-                void unblock()
-                {
-                    blocking?.Dispose();
-                    blocking = null;
-
-                    Scheduler.Add(() =>
+                    // As a safety measure, unblock after 10 seconds.
+                    // This is to handle the case where a dev may block, but then something on the update thread
+                    // accesses realm and blocks for eternity.
+                    Task.Factory.StartNew(() =>
                     {
-                        blockAction.Enabled.Value = true;
-                        unblockAction.Action = null;
+                        Thread.Sleep(10000);
+                        unblock();
                     });
+
+                    unblockAction.Action = unblock;
+
+                    void unblock()
+                    {
+                        token?.Dispose();
+                        token = null;
+
+                        Scheduler.Add(() =>
+                        {
+                            blockAction.Enabled.Value = true;
+                            unblockAction.Action = null;
+                        });
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Blocking realm failed");
                 }
             };
         }