mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-30 15:02:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop overriding user config on update

Browse Source
This commit is contained in:
Michael Scire 2019-11-27 13:44:09 -08:00
parent fd7aad0bf9
commit 19f21514d9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/cfg/cfg_override.cpp
View File

@ -117,7 +117,7 @@ namespace ams::cfg {
return cfg; return cfg;
} }
int LoaderIniHandler(void *user, const char *section, const char *name, const char *value) { int OverrideConfigIniHandler(void *user, const char *section, const char *name, const char *value) {
/* Taken and modified, with love, from Rajkosto's implementation. */ /* Taken and modified, with love, from Rajkosto's implementation. */
if (strcasecmp(section, "hbl_config") == 0) { if (strcasecmp(section, "hbl_config") == 0) {
/* TODO: Consider deprecating "title_id" string in the future." */ /* TODO: Consider deprecating "title_id" string in the future." */
@ -132,6 +132,12 @@ namespace ams::cfg {
} }
std::snprintf(g_hbl_sd_path, sizeof(g_hbl_sd_path) - 1, "/%s", value); std::snprintf(g_hbl_sd_path, sizeof(g_hbl_sd_path) - 1, "/%s", value);
g_hbl_sd_path[sizeof(g_hbl_sd_path) - 1] = '\0'; g_hbl_sd_path[sizeof(g_hbl_sd_path) - 1] = '\0';
for (size_t i = 0; i < sizeof(g_hbl_sd_path); i++) {
if (g_hbl_sd_path[i] == '\\') {
g_hbl_sd_path[i] = '/';
}
}
} else if (strcasecmp(name, "override_key") == 0) { } else if (strcasecmp(name, "override_key") == 0) {
g_hbl_override_config.override_key = ParseOverrideKey(value); g_hbl_override_config.override_key = ParseOverrideKey(value);
} else if (strcasecmp(name, "override_any_app") == 0) { } else if (strcasecmp(name, "override_any_app") == 0) {
@ -223,8 +229,8 @@ namespace ams::cfg {
util::ini::ParseFile(&config_file, user_ctx, handler); util::ini::ParseFile(&config_file, user_ctx, handler);
} }
void RefreshLoaderConfiguration() { void RefreshOverrideConfiguration() {
ParseIniFile(LoaderIniHandler, "/atmosphere/loader.ini", nullptr); ParseIniFile(OverrideConfigIniHandler, "/atmosphere/override_config.ini", nullptr);
} }
ContentSpecificOverrideConfig GetContentOverrideConfig(ncm::ProgramId program_id) { ContentSpecificOverrideConfig GetContentOverrideConfig(ncm::ProgramId program_id) {
@ -257,8 +263,8 @@ namespace ams::cfg {
return status; return status;
} }
/* Unconditionally refresh loader.ini contents. */ /* Unconditionally refresh override_config.ini contents. */
RefreshLoaderConfiguration(); RefreshOverrideConfiguration();
/* If we can't read the key state, don't override anything. */ /* If we can't read the key state, don't override anything. */
if (R_FAILED(hid::GetKeysHeld(&status.keys_held))) { if (R_FAILED(hid::GetKeysHeld(&status.keys_held))) {