From fe9d8d05bd74fa515189bd00495cdedd47d5fc1e Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Tue, 21 Jan 2025 18:00:51 -0600 Subject: [PATCH] UI: Fixed the Amiibo keybind only working when the UI had been updated. --- src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 483c6d599..07cad41c5 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -1662,10 +1662,7 @@ namespace Ryujinx.Ava.UI.ViewModels public async Task OpenAmiiboWindow() { - if (!IsAmiiboRequested) - return; - - if (AppHost.Device.System.SearchingForAmiibo(out int deviceId)) + if (AppHost.Device.System.SearchingForAmiibo(out int deviceId) && IsGameRunning) { string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper(); AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId); @@ -1683,10 +1680,7 @@ namespace Ryujinx.Ava.UI.ViewModels } public async Task OpenBinFile() { - if (!IsAmiiboRequested) - return; - - if (AppHost.Device.System.SearchingForAmiibo(out int deviceId)) + if (AppHost.Device.System.SearchingForAmiibo(out _) && IsGameRunning) { var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {