diff options
| author | Ac_K <Acoustik666@gmail.com> | 2023-01-09 04:37:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 03:37:20 +0000 |
| commit | 610eecc1c1fec2203fff1ebd71cd10798fbcc05a (patch) | |
| tree | 5855ddb337ac613df0d912264ce02b5341c48aa8 /Ryujinx.Ava/UI/Views | |
| parent | 492056abf6c97696075f16101009aa463c319832 (diff) | |
ava: Fixes regressions from refactoring (#4237)
* ava: Fix regressions from #4178
* Remove duplicated code
* real fix for right click menu
Co-Authored-By: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
* Remove ContentDialogOverlay
Co-authored-by: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Ava/UI/Views')
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs | 5 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs index 8c28abff..788f47a1 100644 --- a/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs +++ b/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs @@ -36,10 +36,7 @@ namespace Ryujinx.Ava.UI.Views.Main private async void StopEmulation_Click(object sender, RoutedEventArgs e) { - await Task.Run(() => - { - Window.ViewModel.AppHost?.ShowExitPrompt(); - }); + await Window.ViewModel.AppHost?.ShowExitPrompt(); } private async void PauseEmulation_Click(object sender, RoutedEventArgs e) diff --git a/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs index d1050ddd..473de0ee 100644 --- a/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs +++ b/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Views.Main { base.OnAttachedToVisualTree(e); - if (this.VisualRoot is MainWindow window) + if (VisualRoot is MainWindow window) { Window = window; } diff --git a/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs index 841d59de..fd757893 100644 --- a/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs +++ b/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Views.Main { base.OnAttachedToVisualTree(e); - if (this.VisualRoot is MainWindow window) + if (VisualRoot is MainWindow window) { ViewModel = window.ViewModel; } |