dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-04-01 18:40:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ime-fixes-again

Browse Source
This commit is contained in:
Valdis Bogdāns 2026-03-26 23:45:33 +02:00 committed by GitHub
commit c1808bc8d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/emulator_settings.cpp
View File

@ -633,6 +633,41 @@ bool EmulatorSettingsImpl::TransferSettings() {
LOG_WARNING(Config, "Failed to transfer addon install directory: {}", e.what());
}
}
if (og_data.contains("General")) {
const toml::value& general = og_data.at("General");
auto& s = m_general;
// Transfer sysmodules install directory
try {
std::string sysmodules_install_dir_str;
if (general.contains("sysModulesPath")) {
const auto& sysmodule_value = general.at("sysModulesPath");
if (sysmodule_value.is_string()) {
sysmodules_install_dir_str = toml::get<std::string>(sysmodule_value);
if (!sysmodules_install_dir_str.empty()) {
s.sys_modules_dir.value = std::filesystem::path{sysmodules_install_dir_str};
}
}
}
} catch (const std::exception& e) {
LOG_WARNING(Config, "Failed to transfer sysmodules install directory: {}", e.what());
}
// Transfer font install directory
try {
std::string font_install_dir_str;
if (general.contains("fontsPath")) {
const auto& font_value = general.at("fontsPath");
if (font_value.is_string()) {
font_install_dir_str = toml::get<std::string>(font_value);
if (!font_install_dir_str.empty()) {
s.font_dir.value = std::filesystem::path{font_install_dir_str};
}
}
}
} catch (const std::exception& e) {
LOG_WARNING(Config, "Failed to transfer font install directory: {}", e.what());
}
}
return true;
}