From 87067b5b327a2c52d1b1e2d74566f75580afd19a Mon Sep 17 00:00:00 2001
From: Evan Husted <gr33m11@gmail.com>
Date: Fri, 20 Dec 2024 15:41:18 -0600
Subject: [PATCH] UI: Only show Amiibo bin scan menu item if the key file
 exists

---
 .../HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs   | 7 +++----
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs           | 3 +++
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml            | 1 +
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
index d0225da8d..a0b8b5414 100644
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
@@ -333,10 +333,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
             return Path.Combine(AppDataManager.KeysDirPath, "key_retail.bin");
         }
 
-        public static bool HasKeyRetailBinPath()
-        {
-            return File.Exists(GetKeyRetailBinPath());
-        }
+        public static bool HasKeyRetailBinPath => File.Exists(GetKeyRetailBinPath());
+
+        
         public static DateTime DateTimeFromTag(ushort value)
         {
             try
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 5069fc681..592266361 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -307,6 +307,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                 OnPropertyChanged();
             }
         }
+
+        public bool CanScanAmiiboBinaries => AmiiboBinReader.HasKeyRetailBinPath;
+        
         public bool ShowLoadProgress
         {
             get => _showLoadProgress;
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
index 3e66023d8..df15d6c6b 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -176,6 +176,7 @@
                     AttachedToVisualTree="ScanBinAmiiboMenuItem_AttachedToVisualTree"
                     Click="OpenBinFile"
                     Header="{locale:Locale MenuBarActionsScanAmiiboBin}"
+                    IsVisible="{Binding CanScanAmiiboBinaries}"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 8dd7c7a0f..37020d9fb 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -203,7 +203,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (sender is MenuItem)
-                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath();
+                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath;
         }
 
         private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)