From a93b42d218cadffa1422a9b2c70398187b9b6a4b Mon Sep 17 00:00:00 2001
From: Jacobwasbeast <jacobwasbeast@outlook.com>
Date: Tue, 10 Dec 2024 10:29:44 -0600
Subject: [PATCH] Fix Logical Inconsistencies

---
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs   | 8 ++++----
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml    | 2 +-
 src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
                     Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 5022414ff..e11e671ae 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -170,7 +170,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (sender is MenuItem)
-                ViewModel.IsBinAmiiboRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath();
+                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath();
         }
 
         private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)