MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Fix Logical Inconsistencies

Browse Source
This commit is contained in:
Jacobwasbeast 2024-12-10 10:29:44 -06:00
parent bc79830b3b
commit a93b42d218
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@ -72,6 +72,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private string _gpuStatusText; private string _gpuStatusText;
private string _shaderCountText; private string _shaderCountText;
private bool _isAmiiboRequested; private bool _isAmiiboRequested;
private bool _isAmiiboBinRequested;
private bool _showRightmostSeparator; private bool _showRightmostSeparator;
private bool _isGameRunning; private bool _isGameRunning;
private bool _isFullScreen; private bool _isFullScreen;
@ -318,17 +319,16 @@ namespace Ryujinx.Ava.UI.ViewModels
OnPropertyChanged(); OnPropertyChanged();
} }
} }
public bool IsBinAmiiboRequested public bool IsAmiiboBinRequested
{ {
get => IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath(); get => _isAmiiboBinRequested && _isGameRunning;
set set
{ {
_isAmiiboRequested = value; _isAmiiboBinRequested = value;
OnPropertyChanged(); OnPropertyChanged();
} }
} }
public bool ShowLoadProgress public bool ShowLoadProgress
{ {
get => _showLoadProgress; get => _showLoadProgress;

2
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
View File

@ -247,7 +247,7 @@
Click="OpenBinFile" Click="OpenBinFile"
Header="{ext:Locale MenuBarActionsScanAmiiboBin}" Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
Icon="{ext:Icon mdi-cube-scan}" Icon="{ext:Icon mdi-cube-scan}"
IsEnabled="{Binding IsBinAmiiboRequested}" /> IsEnabled="{Binding IsAmiiboBinRequested}" />
<MenuItem <MenuItem
Command="{Binding TakeScreenshot}" Command="{Binding TakeScreenshot}"
Header="{ext:Locale MenuBarFileToolsTakeScreenshot}" Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"

2
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
View File

@ -170,7 +170,7 @@ namespace Ryujinx.Ava.UI.Views.Main
private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e) private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
{ {
if (sender is MenuItem) 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) private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)