sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Don't use bindables to avoid potential cross-usage contamination

Browse Source
This commit is contained in:
Dean Herbert
2023-01-10 01:10:20 +09:00
parent 62ffb4fe78
commit 811a562608
6 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Database/ModelManager.cs
View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using osu.Framework.Bindables;
using osu.Framework.Platform;
using osu.Game.Beatmaps;
using osu.Game.Extensions;
@ -22,7 +21,7 @@ namespace osu.Game.Database
/// <summary>
/// Temporarily pause imports to avoid performance overheads affecting gameplay scenarios.
/// </summary>
public readonly BindableBool PauseImports = new BindableBool();
public virtual bool PauseImports { get; set; }
protected RealmAccess Realm { get; }

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

@ -8,7 +8,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Humanizer;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Logging;
@ -60,7 +59,7 @@ namespace osu.Game.Database
/// <summary>
/// Temporarily pause imports to avoid performance overheads affecting gameplay scenarios.
/// </summary>
public readonly BindableBool PauseImports = new BindableBool();
public bool PauseImports { get; set; }
public abstract IEnumerable<string> HandledExtensions { get; }
@ -559,12 +558,12 @@ namespace osu.Game.Database
private void pauseIfNecessary(CancellationToken cancellationToken)
{
if (!PauseImports.Value)
if (!PauseImports)
return;
Logger.Log(@"Import is being paused.");
while (PauseImports.Value)
while (PauseImports)
{
cancellationToken.ThrowIfCancellationRequested();
Thread.Sleep(500);