bel
/
ryubing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_fix_custom_config' into 'master' 

Fixed: Custom setting was reset to global when changed during gameplay.

See merge request [ryubing/ryujinx!164](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/164)
merge-requests/164/merge
Goodfeat 2025-10-25 17:58:32 -05:00
parent c6bc77e4bf 893dda16ce
commit bee83beda6
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Ryujinx/Program.cs
View File

@ -179,22 +179,26 @@ namespace Ryujinx.Ava
return gameDir;
}
public static void ReloadConfig()
public static void ReloadConfig(bool isRunGameWithCustomConfig = false)
{
string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
// Now load the configuration as the other subsystems are now registered
if (File.Exists(localConfigurationPath))
{
ConfigurationPath = localConfigurationPath;
}
else if (File.Exists(appDataConfigurationPath))
{
ConfigurationPath = appDataConfigurationPath;
}
if (!isRunGameWithCustomConfig) // To return settings from the game folder if the user configuration exists
{
// Now load the configuration as the other subsystems are now registered
if (File.Exists(localConfigurationPath))
{
ConfigurationPath = localConfigurationPath;
}
else if (File.Exists(appDataConfigurationPath))
{
ConfigurationPath = appDataConfigurationPath;
}
}
if (ConfigurationPath == null)
{
// No configuration, we load the default values and save it to disk

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

@ -77,11 +77,13 @@ namespace Ryujinx.Ava.UI.ViewModels
public SettingsHacksViewModel DirtyHacks { get; }
private readonly bool _isCustomConfig;
private readonly bool _isGameRunning;
private readonly Bitmap _gameIcon;
private readonly string _gameTitle;
private readonly string _gamePath;
private readonly string _gameId;
public bool IsCustomConfig => _isCustomConfig;
public bool IsGameRunning => _isGameRunning;
public Bitmap GameIcon => _gameIcon;
public string GamePath => _gamePath;
@ -453,6 +455,7 @@ namespace Ryujinx.Ava.UI.ViewModels
_gameIcon = new Bitmap(ms);
}
_isCustomConfig = customConfig;
_isGameRunning = gameRunning;
_gamePath = gamePath;
_gameTitle = gameName;
@ -867,7 +870,7 @@ namespace Ryujinx.Ava.UI.ViewModels
GameListNeedsRefresh = false;
}
private static void RevertIfNotSaved()
private static void RevertIfNotSaved(bool IsCustomConfig = false, bool IsGameRunning = false)
{
/*
maybe this is an unnecessary check(all options need to be tested)
@ -876,7 +879,16 @@ namespace Ryujinx.Ava.UI.ViewModels
Program.ReloadConfig();
}
*/
Program.ReloadConfig();
if (IsCustomConfig && IsGameRunning)
{
Program.ReloadConfig(true); // Restore settings for a custom configuration during a game
}
else
{
Program.ReloadConfig();
}
}
public void ApplyButton()
@ -893,14 +905,14 @@ namespace Ryujinx.Ava.UI.ViewModels
File.Delete(gameDir);
}
RevertIfNotSaved();
RevertIfNotSaved(IsCustomConfig, IsGameRunning);
CloseWindow?.Invoke();
}
public void SaveUserConfig()
{
SaveSettings();
RevertIfNotSaved(); // Revert global configuration after saving user configuration
RevertIfNotSaved(IsCustomConfig, IsGameRunning); // Revert global or custom configuration after saving user configuration
CloseWindow?.Invoke();
}
@ -932,7 +944,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public void CancelButton()
{
RevertIfNotSaved();
RevertIfNotSaved(IsCustomConfig, IsGameRunning);
CloseWindow?.Invoke();
}
}