h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 00:03:21 +08:00
Code Issues Releases Wiki Activity

Remove possibility of double-disposal interference

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-01-23 16:14:58 +01:00
parent 7f89d9117d
commit d22f557a3b
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay
leasedInProgress.Value = true;
// for extra safety, marshal the end of operation back to the update thread if necessary.
return new InvokeOnDisposal(() => Scheduler.Add(endOperation, false));
return new OngoingOperation(() => Scheduler.Add(endOperation, false));
}
private void endOperation()
@ -60,5 +60,26 @@ namespace osu.Game.Screens.OnlinePlay
// clean up the leased reference here so that it doesn't get returned twice.
leasedInProgress = null;
}
private class OngoingOperation : InvokeOnDisposal
{
private bool isDisposed;
public OngoingOperation(Action action)
: base(action)
{
}
public override void Dispose()
{
// base class does not check disposal state for performance reasons which aren't relevant here.
// track locally, to avoid interfering with other operations in case of a potential double-disposal.
if (isDisposed)
return;
base.Dispose();
isDisposed = true;
}
}
}
}