diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 6acbbe230..d1b70b32b 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -72,6 +72,7 @@ namespace Ryujinx.Ava.UI.ViewModels private string _gpuStatusText; private string _shaderCountText; private bool _isAmiiboRequested; + private bool _isAmiiboBinRequested; private bool _showRightmostSeparator; private bool _isGameRunning; private bool _isFullScreen; @@ -318,17 +319,16 @@ namespace Ryujinx.Ava.UI.ViewModels OnPropertyChanged(); } } - public bool IsBinAmiiboRequested + public bool IsAmiiboBinRequested { - get => IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath(); + get => _isAmiiboBinRequested && _isGameRunning; set { - _isAmiiboRequested = value; + _isAmiiboBinRequested = value; OnPropertyChanged(); } } - public bool ShowLoadProgress { get => _showLoadProgress; diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml index e3fc3d33d..c3d16529d 100644 --- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml +++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml @@ -247,7 +247,7 @@ Click="OpenBinFile" Header="{ext:Locale MenuBarActionsScanAmiiboBin}" Icon="{ext:Icon mdi-cube-scan}" - IsEnabled="{Binding IsBinAmiiboRequested}" /> + IsEnabled="{Binding IsAmiiboBinRequested}" />