From 4574589dc6e6c875144a65e362413e4313043373 Mon Sep 17 00:00:00 2001 From: flb Date: Tue, 16 Feb 2021 19:47:58 +0100 Subject: [PATCH] uncommented copy code --- Makefile | 2 +- resources/i18n/en-US/menus.json | 1 + source/changelog_page.cpp | 3 ++- source/utils.cpp | 5 ++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 34033e8..139359e 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ DATA := data INCLUDES := include lib/zipper/include APP_TITLE := All-in-One Switch Updater APP_AUTHOR := HamletDuFromage -APP_VERSION := 2.3.1 +APP_VERSION := 2.3.2 TARGET := $(notdir $(CURDIR)) ROMFS := resources diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json index fa1e313..d701954 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -75,6 +75,7 @@ "v2_2_1_text": "\uE016 Fixed non Atmosphere CFW being wrongly categorised as ams.", "v2_3_0_text": "\uE016 Added possibility to copy a list of files to custom locations. This may come in handy for trinket/esoteric bootloader users.\n\uE016 Added warning screen on launch.\n\uE016 Few UI tweaks.\n\uE016 Traditional Chinese translation updated (qazrfv1234)", "v2_3_1_text": "\uE016 Files for batch copy are now copied according to the json order (formerly alphabetical order).", + "v2_3_2_text": "\uE016 Fixed batch copy not copying :^)", "Ok_button": "Ok", "cheats_page.cpp":"", diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index 823518d..a05edf5 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -106,7 +106,8 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) verTitles.push_back("v2.3.1"); changes.push_back("menus/v2_3_1_text"_i18n ); - + verTitles.push_back("v2.3.2"); + changes.push_back("menus/v2_3_1_text"_i18n ); int nbVersions = verTitles.size(); items.reserve(nbVersions); diff --git a/source/utils.cpp b/source/utils.cpp index 34aabe4..0b27833 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -8,7 +8,6 @@ #include "main_frame.hpp" #include #include -#include namespace i18n = brls::i18n; using namespace i18n::literals; @@ -374,8 +373,8 @@ std::string copyFiles(const char* path) { for (auto it = toMove.begin(); it != toMove.end(); ++it) { if(std::filesystem::exists(it.key())) { createTree(std::string(std::filesystem::path(it.value().get()).parent_path()) + "/"); - //cp(it.key().c_str(), it.value().get().c_str()); - std::cout << it.key() << it.value().get() << std::endl; + cp(it.key().c_str(), it.value().get().c_str()); + //std::cout << it.key() << it.value().get() << std::endl; } else { error += it.key() + "\n";