mirror of
https://github.com/ppy/osu.git
synced 2025-02-19 12:13:20 +08:00
Merge branch 'master' into fix-main-menu-storyboard-crash
This commit is contained in:
commit
ddbbd594c6
@ -424,7 +424,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
|||||||
|
|
||||||
private void hideError() => ErrorText.FadeOut(50);
|
private void hideError() => ErrorText.FadeOut(50);
|
||||||
|
|
||||||
private void onSuccess(Room room)
|
private void onSuccess(Room room) => Schedule(() =>
|
||||||
{
|
{
|
||||||
Debug.Assert(applyingSettingsOperation != null);
|
Debug.Assert(applyingSettingsOperation != null);
|
||||||
|
|
||||||
@ -432,9 +432,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
|||||||
|
|
||||||
applyingSettingsOperation.Dispose();
|
applyingSettingsOperation.Dispose();
|
||||||
applyingSettingsOperation = null;
|
applyingSettingsOperation = null;
|
||||||
}
|
});
|
||||||
|
|
||||||
private void onError(string text)
|
private void onError(string text) => Schedule(() =>
|
||||||
{
|
{
|
||||||
Debug.Assert(applyingSettingsOperation != null);
|
Debug.Assert(applyingSettingsOperation != null);
|
||||||
|
|
||||||
@ -455,7 +455,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
|||||||
|
|
||||||
applyingSettingsOperation.Dispose();
|
applyingSettingsOperation.Dispose();
|
||||||
applyingSettingsOperation = null;
|
applyingSettingsOperation = null;
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CreateOrUpdateButton : TriangleButton
|
public class CreateOrUpdateButton : TriangleButton
|
||||||
|
Loading…
Reference in New Issue
Block a user