mirror of
https://github.com/ppy/osu.git
synced 2024-09-24 10:07:28 +08:00
8c3955d341
Finishing an operation started via `OngoingOperationTracker.BeginOperation()` was risky in cases where the operation ended at a callback on another thread (which, in the case of multiplayer, is *most* cases). In particular, if any consumer registered a callback that mutates transforms when the operation ends, it would result in crashes after the framework-side safety checks. Rework `OngoingOperationTracker` into an always-present component residing in the drawable hierarchy, and ensure that the `operationInProgress` bindable is always updated on the update thread. This way consumers don't have to add local schedules in multiple places.
45 lines
1.5 KiB
C#
45 lines
1.5 KiB
C#
// 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 osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Game.Online.Multiplayer;
|
|
using osu.Game.Screens.OnlinePlay;
|
|
using osu.Game.Screens.OnlinePlay.Lounge.Components;
|
|
|
|
namespace osu.Game.Tests.Visual.Multiplayer
|
|
{
|
|
public class TestMultiplayerRoomContainer : Container
|
|
{
|
|
protected override Container<Drawable> Content => content;
|
|
private readonly Container content;
|
|
|
|
[Cached(typeof(StatefulMultiplayerClient))]
|
|
public readonly TestMultiplayerClient Client;
|
|
|
|
[Cached(typeof(IRoomManager))]
|
|
public readonly TestMultiplayerRoomManager RoomManager;
|
|
|
|
[Cached]
|
|
public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
|
|
|
|
[Cached]
|
|
public readonly OngoingOperationTracker OngoingOperationTracker;
|
|
|
|
public TestMultiplayerRoomContainer()
|
|
{
|
|
RelativeSizeAxes = Axes.Both;
|
|
|
|
AddRangeInternal(new Drawable[]
|
|
{
|
|
Client = new TestMultiplayerClient(),
|
|
RoomManager = new TestMultiplayerRoomManager(),
|
|
OngoingOperationTracker = new OngoingOperationTracker(),
|
|
content = new Container { RelativeSizeAxes = Axes.Both }
|
|
});
|
|
}
|
|
}
|
|
}
|