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

Improved interaction with "Input" settings. #708

Open
Goodfeat wants to merge 27 commits from Goodfeat/Master_PR into master
pull from: Goodfeat/Master_PR
merge into: MeloNX:master
Conversation 5 Commits 27 Files Changed 13 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e097ea71ff - Show all commits

12
src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
View File

@ -465,7 +465,15 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
await Dispatcher.UIThread.InvokeAsync(() => await Dispatcher.UIThread.InvokeAsync(() =>
{ {
LoadDevices(); LoadDevices();
if (Config != null)
{
// Load configuration after disconnection if it is in the configuration file
IsModified = true;
LoadSavedConfiguration();
}
FindPairedDevice(); FindPairedDevice();
_isChangeTrackingActive = true; _isChangeTrackingActive = true;
return System.Threading.Tasks.Task.CompletedTask; return System.Threading.Tasks.Task.CompletedTask;
}); });
@ -474,7 +482,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
private async void HandleOnGamepadConnected(string id) private async void HandleOnGamepadConnected(string id)
{ {
_isChangeTrackingActive = false; _isChangeTrackingActive = false;
await Dispatcher.UIThread.InvokeAsync(() => await Dispatcher.UIThread.InvokeAsync(() =>
{ {
LoadDevices(); LoadDevices();
@ -485,7 +492,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
IsModified = true; IsModified = true;
LoadSavedConfiguration(); LoadSavedConfiguration();
} }
_isChangeTrackingActive = true; _isChangeTrackingActive = true;
}); });
} }
@ -847,6 +853,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
{ {
_isLoaded = false; _isLoaded = false;
config.Id = null; // ignore device IDs (there is no longer a need to store device IDs for presets due to their independence from devices)
LoadConfiguration(config); LoadConfiguration(config);
// This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers