h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 23:23:18 +08:00
Code Issues Releases Wiki Activity

Fix incorrect event order.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-02 17:41:33 +09:00
parent 68857b573d
commit 963117f07d
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/DialogOverlay.cs
View File

@ -20,15 +20,14 @@ namespace osu.Game.Overlays
{ {
if (dialog == currentDialog) return; if (dialog == currentDialog) return;
State = Visibility.Visible;
dialogContainer.Add(dialog);
dialog.Show();
dialog.StateChanged += onDialogOnStateChanged;
currentDialog?.Hide(); currentDialog?.Hide();
currentDialog = dialog; currentDialog = dialog;
dialogContainer.Add(currentDialog);
currentDialog.Show();
currentDialog.StateChanged += onDialogOnStateChanged;
State = Visibility.Visible;
} }
private void onDialogOnStateChanged(OverlayContainer dialog, Visibility v) private void onDialogOnStateChanged(OverlayContainer dialog, Visibility v)
@ -38,6 +37,7 @@ namespace osu.Game.Overlays
//handle the dialog being dismissed. //handle the dialog being dismissed.
dialog.Delay(PopupDialog.EXIT_DURATION); dialog.Delay(PopupDialog.EXIT_DURATION);
dialog.Expire(); dialog.Expire();
if (dialog == currentDialog) if (dialog == currentDialog)
State = Visibility.Hidden; State = Visibility.Hidden;
} }