sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix ongoing operation being begun in an async context

Browse Source
This commit is contained in:
Dean Herbert
2021-07-02 16:04:51 +09:00
parent f2d9d78455
commit 7b0f970e7d
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
View File

@ -66,19 +66,23 @@ namespace osu.Game.Tests.Visual.Multiplayer
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(200, 50), Size = new Vector2(200, 50),
OnReadyClick = () => Task.Run(async () => OnReadyClick = () =>
{ {
readyClickOperation = OngoingOperationTracker.BeginOperation(); readyClickOperation = OngoingOperationTracker.BeginOperation();
if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready) Task.Run(async () =>
{ {
await Client.StartMatch(); if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
return; {
} await Client.StartMatch();
return;
}
await Client.ToggleReady(); await Client.ToggleReady();
readyClickOperation.Dispose();
}) readyClickOperation.Dispose();
});
}
}); });
}); });

32
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
View File

@ -70,31 +70,39 @@ namespace osu.Game.Tests.Visual.Multiplayer
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(200, 50), Size = new Vector2(200, 50),
OnSpectateClick = () => Task.Run(async () => OnSpectateClick = () =>
{ {
readyClickOperation = OngoingOperationTracker.BeginOperation(); readyClickOperation = OngoingOperationTracker.BeginOperation();
await Client.ToggleSpectate();
readyClickOperation.Dispose(); Task.Run(async () =>
}) {
await Client.ToggleSpectate();
readyClickOperation.Dispose();
});
}
}, },
readyButton = new MultiplayerReadyButton readyButton = new MultiplayerReadyButton
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(200, 50), Size = new Vector2(200, 50),
OnReadyClick = () => Task.Run(async () => OnReadyClick = () =>
{ {
readyClickOperation = OngoingOperationTracker.BeginOperation(); readyClickOperation = OngoingOperationTracker.BeginOperation();
if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready) Task.Run(async () =>
{ {
await Client.StartMatch(); if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
return; {
} await Client.StartMatch();
return;
}
await Client.ToggleReady(); await Client.ToggleReady();
readyClickOperation.Dispose();
}) readyClickOperation.Dispose();
});
}
} }
} }
}; };