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

Fix conflict

Browse Source
This commit is contained in:
Vova 2025-02-12 18:25:46 +10:00
parent 62f7974f14
commit 63ffad3bda
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx/Assets/locales.json
View File

@ -24073,4 +24073,4 @@
} }
} }
] ]
} }

13
src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
View File

@ -42,19 +42,6 @@ namespace Ryujinx.Ava.UI.Controls
await CompatibilityList.Show((string)playabilityLabel.Tag); await CompatibilityList.Show((string)playabilityLabel.Tag);
} }
public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
{
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
{
await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
//viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));
viewModel.RefreshView();
}
}
private async void IdString_OnClick(object sender, RoutedEventArgs e) private async void IdString_OnClick(object sender, RoutedEventArgs e)
{ {
if (DataContext is not MainWindowViewModel mwvm) if (DataContext is not MainWindowViewModel mwvm)

2
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@ -71,8 +71,6 @@ namespace Ryujinx.Ava.UI.ViewModels
[ObservableProperty] private string _ldnServer; [ObservableProperty] private string _ldnServer;
public SettingsHacksViewModel DirtyHacks { get; } public SettingsHacksViewModel DirtyHacks { get; }
public string GamePath { get; }
public string GameName { get; }
private readonly bool _isGameRunning; private readonly bool _isGameRunning;
private Bitmap _gameIcon; private Bitmap _gameIcon;