Creepso/Keaton-Ryujinx
1
0
Fork 0
mirror of https://github.com/KeatonTheBot/Ryujinx.git synced 2026-05-08 04:59:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Fixed the Amiibo keybind only working when the UI had been updated.

Browse source
This commit is contained in:
Evan Husted 2025-01-21 18:00:51 -06:00 committed by KeatonTheBot
parent 7218c66565
commit 72ab6ae184
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -2097,12 +2097,27 @@ namespace Ryujinx.Ava.UI.ViewModels
}); });
} }
public async Task OpenAmiiboWindow()
{
if (AppHost.Device.System.SearchingForAmiibo(out int deviceId) && IsGameRunning)
{
string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);
await window.ShowDialog(Window);
if (window.IsScanned)
{
ShowAll = window.ViewModel.ShowAllAmiibo;
LastScannedAmiiboId = window.ScannedAmiibo.GetId();
AppHost.Device.System.ScanAmiibo(deviceId, LastScannedAmiiboId, window.ViewModel.UseRandomUuid);
}
}
}
public async Task OpenBinFile() public async Task OpenBinFile()
{ {
if (!IsAmiiboRequested) if (AppHost.Device.System.SearchingForAmiibo(out _) && IsGameRunning)
return;
if (AppHost.Device.System.SearchingForAmiibo(out int deviceId))
{ {
var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
{ {
@ -2123,28 +2138,6 @@ namespace Ryujinx.Ava.UI.ViewModels
} }
} }
public async Task OpenAmiiboWindow()
{
if (!IsAmiiboRequested)
return;
if (AppHost.Device.System.SearchingForAmiibo(out int deviceId))
{
string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);
await window.ShowDialog(Window);
if (window.IsScanned)
{
ShowAll = window.ViewModel.ShowAllAmiibo;
LastScannedAmiiboId = window.ScannedAmiibo.GetId();
AppHost.Device.System.ScanAmiibo(deviceId, LastScannedAmiiboId, window.ViewModel.UseRandomUuid);
}
}
}
public void ToggleFullscreen() public void ToggleFullscreen()
{ {