diff --git a/inc/data.h b/inc/data.h index fa73862..7a494c4 100644 --- a/inc/data.h +++ b/inc/data.h @@ -7,8 +7,8 @@ #include "gfx.h" -#define BLD_MON 07 -#define BLD_DAY 27 +#define BLD_MON 10 +#define BLD_DAY 31 #define BLD_YEAR 2024 namespace data diff --git a/src/cfg.cpp b/src/cfg.cpp index 6b1c1f7..44d0364 100644 --- a/src/cfg.cpp +++ b/src/cfg.cpp @@ -151,7 +151,7 @@ void cfg::resetConfig() cfg::config["accSysSave"] = false; cfg::config["sysSaveWrite"] = false; cfg::config["directFsCmd"] = false; - cfg::config["zip"] = false; + cfg::config["zip"] = true; cfg::config["langOverride"] = false; cfg::config["trashBin"] = true; cfg::config["autoName"] = false; @@ -345,6 +345,7 @@ static void loadDriveConfig() if (json_object_object_get_ex(webdavJSON, "password", &password)) { cfg::webdavPassword = json_object_get_string(password); } + json_object_put(webdavJSON); } } @@ -506,7 +507,6 @@ void cfg::saveConfig() fprintf(cfgOut, "enableTrashBin = %s\n", boolToText(cfg::config["trashBin"]).c_str()); fprintf(cfgOut, "titleSortType = %s\n", sortTypeText().c_str()); fprintf(cfgOut, "animationScale = %f\n", ui::animScale); - fprintf(cfgOut, "autoUpload = %s\n", boolToText(cfg::config["autoUpload"]).c_str()); if(!cfg::driveRefreshToken.empty()) fprintf(cfgOut, "driveRefreshToken = %s\n", cfg::driveRefreshToken.c_str()); diff --git a/src/main.cpp b/src/main.cpp index d118dbc..b64f252 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,7 +61,6 @@ int main(int argc, const char *argv[]) fs::remoteExit(); curl_global_cleanup(); - cfg::saveConfig(); ui::exit(); data::exit(); gfx::exit(); diff --git a/src/ui/sett.cpp b/src/ui/sett.cpp index b72a006..6acb246 100644 --- a/src/ui/sett.cpp +++ b/src/ui/sett.cpp @@ -227,11 +227,8 @@ static void toggleOpt(void *a) if(ui::animScale > 8) ui::animScale = 1; break; - - case 21: - toggleBool(cfg::config["autoUpload"]); - break; } + cfg::saveConfig(); } static void updateMenuText() @@ -255,7 +252,6 @@ static void updateMenuText() char tmp[16]; sprintf(tmp, "%.1f", ui::animScale); ui::settMenu->editOpt(20, NULL, ui::getUIString(settMenuStr, 20) + std::string(tmp)); - ui::settMenu->editOpt(21, NULL, ui::getUIString(settMenuStr, 21) + getBoolText(cfg::config["autoUpload"])); } void ui::settInit() @@ -272,7 +268,7 @@ void ui::settInit() optHelpX = 1220 - gfx::getTextWidth(ui::getUICString("helpSettings", 0), 18); - for(unsigned i = 0; i < 22; i++) + for(unsigned i = 0; i < 21; i++) { ui::settMenu->addOpt(NULL, ui::getUIString("settingsMenu", i)); ui::settMenu->optAddButtonEvent(i, HidNpadButton_A, toggleOpt, NULL);