mirror of
https://github.com/ppy/osu
synced 2025-03-23 11:27:24 +00:00
Revert changes to LoungeSubScreen.Join()
- `virtual` modifier was used in mocking. - The spacing change revert is just mostly to keep it out of the final diff.
This commit is contained in:
parent
1ce268be3f
commit
6c8490bc7e
@ -297,29 +297,26 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
|
|||||||
popoverContainer.HidePopover();
|
popoverContainer.HidePopover();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null)
|
public virtual void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null) => Schedule(() =>
|
||||||
{
|
{
|
||||||
Schedule(() =>
|
if (joiningRoomOperation != null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
|
||||||
|
|
||||||
|
RoomManager?.JoinRoom(room, password, _ =>
|
||||||
{
|
{
|
||||||
if (joiningRoomOperation != null)
|
Open(room);
|
||||||
return;
|
joiningRoomOperation?.Dispose();
|
||||||
|
joiningRoomOperation = null;
|
||||||
joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
|
onSuccess?.Invoke(room);
|
||||||
|
}, error =>
|
||||||
RoomManager?.JoinRoom(room, password, _ =>
|
{
|
||||||
{
|
joiningRoomOperation?.Dispose();
|
||||||
Open(room);
|
joiningRoomOperation = null;
|
||||||
joiningRoomOperation?.Dispose();
|
onFailure?.Invoke(error);
|
||||||
joiningRoomOperation = null;
|
|
||||||
onSuccess?.Invoke(room);
|
|
||||||
}, error =>
|
|
||||||
{
|
|
||||||
joiningRoomOperation?.Dispose();
|
|
||||||
joiningRoomOperation = null;
|
|
||||||
onFailure?.Invoke(error);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Copies a room and opens it as a fresh (not-yet-created) one.
|
/// Copies a room and opens it as a fresh (not-yet-created) one.
|
||||||
|
Loading…
Reference in New Issue
Block a user