h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #18875 from peppy/logging-finalise-selection-abort-operations

Browse Source 
Add logging for various cases of `SongSelect.FinaliseSelection` being aborted
This commit is contained in:
Dan Balasescu 2022-06-27 21:33:51 +09:00 committed by GitHub
commit c2b03cb6b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface;
@ -78,7 +79,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
protected override bool SelectItem(PlaylistItem item)
{
if (operationInProgress.Value)
{
Logger.Log($"{nameof(SelectedItem)} aborted due to {nameof(operationInProgress)}");
return false;
}
// If the client is already in a room, update via the client.
// Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.

3
osu.Game/Screens/Select/SongSelect.cs
View File

@ -360,7 +360,10 @@ namespace osu.Game.Screens.Select
{
// This is very important as we have not yet bound to screen-level bindables before the carousel load is completed.
if (!Carousel.BeatmapSetsLoaded)
{
Logger.Log($"{nameof(FinaliseSelection)} aborted as carousel beatmaps are not yet loaded");
return;
}
if (ruleset != null)
Ruleset.Value = ruleset;