diff --git a/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs b/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs index d35f44bf5..a2a944297 100644 --- a/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs +++ b/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs @@ -53,8 +53,6 @@ namespace Ryujinx.Ava.UI.Applet bool opened = false; - _parent.Activate(); - UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, title, message, diff --git a/src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs b/src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs index 7dab57b88..c8e4db083 100644 --- a/src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs +++ b/src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs @@ -315,8 +315,10 @@ namespace Ryujinx.Ava.UI.Helpers Window parent = GetMainWindow(); - if (parent is { IsActive: true } and MainWindow window && window.ViewModel.IsGameRunning) + if (parent is MainWindow window && window.ViewModel.IsGameRunning) { + parent.Activate(); + contentDialogOverlayWindow = new() { Height = parent.Bounds.Height, @@ -369,7 +371,9 @@ namespace Ryujinx.Ava.UI.Helpers } else { - result = await contentDialog.ShowAsync(); + result = ContentDialogResult.None; + + Logger.Warning?.Print(LogClass.Ui, "Content dialog overlay failed to populate. Default value has been returned."); } return result; @@ -390,7 +394,7 @@ namespace Ryujinx.Ava.UI.Helpers { foreach (Window item in al.Windows) { - if (item.IsActive && item is MainWindow window) + if (item is MainWindow window) { return window; }