diff --git a/.gitignore b/.gitignore index 5a9878b..6b3b103 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ !.vscode/c_cpp_properties.json build/ screenshots/ +libnx/ switch/ *.elf *.nacp diff --git a/Makefile b/Makefile index 95c707c..69895c2 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ DATA := data INCLUDES := include lib/zipper/include /lib/borealis/library/include/borealis/extern/nlohmann APP_TITLE := All-in-One Switch Updater APP_AUTHOR := HamletDuFromage -APP_VERSION := 2.4.4 +APP_VERSION := 2.4.5-ams_fix TARGET := $(notdir $(CURDIR)) ROMFS := resources diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index 778759d..8db7dd0 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -130,6 +130,10 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) verTitles.push_back("v2.4.4"); changes.push_back("\uE016 Significantly reduced time to retrieve build IDs.\n\uE016 Updated Polish localisation (thanks to https://github.com/teddy74eva)."); + verTitles.push_back("v2.4.5-fix_ams"); + changes.push_back("\uE016 Atmosphère 0.19+ support. Note that this version assumes your switch is running Atmosphère. I should fix this soon, but if you're on SXOS, please stay on 2.4.4."); + + for(int i = verTitles.size() -1 ; i >= 0; i--){ listItem = new brls::ListItem(verTitles[i]); change = changes[i]; diff --git a/source/main.cpp b/source/main.cpp index 36ac225..297a8c8 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -14,7 +14,8 @@ using namespace i18n::literals; //TimeServiceType __nx_time_service_type = TimeServiceType_System; -const CFW CurrentCfw::running_cfw = CurrentCfw::getCFW(); +//const CFW CurrentCfw::running_cfw = CurrentCfw::getCFW(); +const CFW CurrentCfw::running_cfw = CFW::ams; int main(int argc, char* argv[]) { diff --git a/source/utils.cpp b/source/utils.cpp index c7df544..e94e297 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -265,30 +265,10 @@ bool isErista() { }; void removeSysmodulesFlags(const char * directory) { - const std::set AMS_SYSMODULES{ - "010000000000000D", - "010000000000002B", - "0100000000000032", - "0100000000000036", - "0100000000000042", - "0100000000000008", - "010000000000003C", - "0100000000000034", - "0100000000000037" - }; - bool found = false; for (const auto & e : std::filesystem::recursive_directory_iterator(directory)) { if(e.path().string().find("boot2.flag") != std::string::npos) { - for(const auto & c : AMS_SYSMODULES) { - if(e.path().string().find(c) != std::string::npos) { - found = true; - break; - } - } - if(!found) std::filesystem::remove(e.path()); } - found = false; } }