Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Goodfeat committed Feb 12, 2025
1 parent 62f7974 commit 63ffad3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion src/Ryujinx/Assets/locales.json
Original file line number Diff line number Diff line change
Expand Up @@ -24073,4 +24073,4 @@
}
}
]
}
}
13 changes: 0 additions & 13 deletions src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,6 @@ private async void PlayabilityStatus_OnClick(object sender, RoutedEventArgs e)
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)
{
if (DataContext is not MainWindowViewModel mwvm)
Expand Down
2 changes: 0 additions & 2 deletions src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ public partial class SettingsViewModel : BaseModel
[ObservableProperty] private string _ldnServer;

public SettingsHacksViewModel DirtyHacks { get; }
public string GamePath { get; }
public string GameName { get; }

private readonly bool _isGameRunning;
private Bitmap _gameIcon;
Expand Down

0 comments on commit 63ffad3

Please sign in to comment.