mirror of
https://github.com/ppy/osu
synced 2024-12-15 03:16:17 +00:00
Guard against potential exception while blocking realm
This commit is contained in:
parent
9ff9611296
commit
b0919722ac
@ -1,11 +1,13 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// 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.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
|
using osu.Framework.Logging;
|
||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Database;
|
using osu.Game.Database;
|
||||||
using osu.Game.Localisation;
|
using osu.Game.Localisation;
|
||||||
@ -52,30 +54,38 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
|
|||||||
|
|
||||||
blockAction.Action = () =>
|
blockAction.Action = () =>
|
||||||
{
|
{
|
||||||
var blocking = realmFactory.BlockAllOperations();
|
try
|
||||||
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(() =>
|
|
||||||
{
|
{
|
||||||
Thread.Sleep(10000);
|
var token = realmFactory.BlockAllOperations();
|
||||||
unblock();
|
|
||||||
});
|
|
||||||
|
|
||||||
unblockAction.Action = unblock;
|
blockAction.Enabled.Value = false;
|
||||||
|
|
||||||
void unblock()
|
// 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
|
||||||
blocking?.Dispose();
|
// accesses realm and blocks for eternity.
|
||||||
blocking = null;
|
Task.Factory.StartNew(() =>
|
||||||
|
|
||||||
Scheduler.Add(() =>
|
|
||||||
{
|
{
|
||||||
blockAction.Enabled.Value = true;
|
Thread.Sleep(10000);
|
||||||
unblockAction.Action = null;
|
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");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user