camerin
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fuckshit4

This commit is contained in:
lizzie 2026-01-27 19:32:40 +00:00
parent 64b4f905e4
commit b3e02c633d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/hle/service/set/system_settings_server.cpp
View File

@ -371,7 +371,7 @@ ISystemSettingsServer::~ISystemSettingsServer() {
}
bool ISystemSettingsServer::LoadSettingsFile(std::filesystem::path& path, auto&& default_func) {
using settings_type = boost::function_traits<decltype(default_func)>::arg1_type;
using settings_type = std::decay_t<decltype(default_func())>;
if (!Common::FS::CreateDirs(path)) {
return false;
@ -381,8 +381,7 @@ bool ISystemSettingsServer::LoadSettingsFile(std::filesystem::path& path, auto&&
auto exists = std::filesystem::exists(settings_file);
auto file_size_ok = exists && std::filesystem::file_size(settings_file) == sizeof(SettingsHeader) + sizeof(settings_type);
auto ResetToDefault = [&]() {
settings_type default_settings = {};
default_func(default_settings);
auto default_settings = default_func();
SettingsHeader hdr{
.magic = SETTINGS_MAGIC,
.version = SETTINGS_VERSION,
@ -1368,7 +1367,8 @@ Result ISystemSettingsServer::GetHttpAuthConfigs(Out<s32> out_count, OutBuffer<B
R_SUCCEED();
}
static void DefaultSystemSettings(SystemSettings& settings) {
static SystemSettings DefaultSystemSettings() {
SystemSettings settings = {};
settings.version = 0x140000;
settings.flags = 7;
@ -1424,16 +1424,21 @@ static void DefaultSystemSettings(SystemSettings& settings) {
if (key_code != language_to_layout.end()) {
settings.keyboard_layout = key_code->second;
}
return settings;
}
static void DefaultPrivateSettings(PrivateSettings& settings) {
static PrivateSettings DefaultPrivateSettings() {
return {};
}
static void DefaultDeviceSettings(DeviceSettings& settings) {
static DeviceSettings DefaultDeviceSettings() {
return {};
}
static void DefaultApplnSettings(ApplnSettings& settings) {
static ApplnSettings DefaultApplnSettings() {
ApplnSettings settings = {};
settings.mii_author_id = Common::UUID::MakeDefault();
return settings;
}
// URVO fails on MSVC, causing stack __chkstk to fail due to the sheer bigness of SystemSettings :)