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

Merge branch 'master' into fix-participants-list

Browse Source
This commit is contained in:
Dan Balasescu
2021-01-14 21:30:53 +09:00
committed by GitHub
parent b51b07c3a9 ef6245813b
commit 3e8732a59f
25 changed files with 178 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -241,8 +241,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
void endOperation()
{
Debug.Assert(readyClickOperation != null);
readyClickOperation.Dispose();
readyClickOperation?.Dispose();
readyClickOperation = null;
}
}
@ -255,9 +254,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
Debug.Assert(readyClickOperation != null);
readyClickOperation.Dispose();
readyClickOperation?.Dispose();
readyClickOperation = null;
}

2
osu.Game/Screens/Ranking/ReplayDownloadButton.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Screens.Ranking
scores.Download(Model.Value);
break;
case DownloadState.Downloaded:
case DownloadState.Importing:
case DownloadState.Downloading:
shakeContainer.Shake();
break;