diff --git a/Makefile b/Makefile index 5582aab..d392b9e 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -D__SWITCH__ \ -DAPP_TITLE="\"$(APP_TITLE)\"" -DAPP_TITLE_LOWER="\"$(TARGET)\"" -CXXFLAGS := $(CFLAGS) -std=gnu++20 -fexceptions -Wno-reorder +CXXFLAGS := $(CFLAGS) -std=gnu++23 -fexceptions -Wno-reorder ASFLAGS := -g $(ARCH) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) diff --git a/README.md b/README.md index caada39..848c3be 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ Copy the `aio-switch-updater/` directory to `/switch/` on your sdcard. - Download and update Hekate, as well as a selection of RCM payloads ### ⬦ Custom Downloads -- A custom Atmosphère url can be entered in [this file](https://github.com/HamletDuFromage/aio-switch-updater/blob/master/custom_packs.json). Once moved to `/config/aio-switch-updater/custom_packs.json`, it will show on the `Custom Download` menu. This can be used to support third-party packs through AIO-Switch-Updater. Non-Atmosphère downloads can also be added in the `misc` category. +- A custom Atmosphère url can be entered in [this file](https://github.com/HamletDuFromage/aio-switch-updater/blob/master/custom_packs.json). Once moved to `/config/aio-switch-updater/custom_packs.json`, it will show on the `Custom Download` menu. This can be used to support third-party packs through AIO-Switch-Updater. Packs whose name starts by `[PACK]` won't prompt for a Hekate download. +- Non-Atmosphère downloads can also be added in the `misc` category. ### ⬦ Download firmwares - Download firmware files to `/firmware` that can then be installed using DayBreak. diff --git a/source/ams_tab.cpp b/source/ams_tab.cpp index 5828c1b..f104c8d 100644 --- a/source/ams_tab.cpp +++ b/source/ams_tab.cpp @@ -34,16 +34,17 @@ bool AmsTab::CreateDownloadItems(const nlohmann::ordered_json& cfw_links, bool h std::string text_hekate = "menus/common/download"_i18n + hekate_link[0].first; for (const auto& link : links) { + bool pack = link.first.contains("[PACK]"); std::string url = link.second; std::string text("menus/common/download"_i18n + link.first + "menus/common/from"_i18n + url); listItem = new brls::ListItem(link.first); listItem->setHeight(LISTITEM_HEIGHT); - listItem->getClickEvent()->subscribe([this, text, text_hekate, url, hekate_url, hekate, ams](brls::View* view) { + listItem->getClickEvent()->subscribe([this, text, text_hekate, url, hekate_url, hekate, pack, ams](brls::View* view) { if (!erista && !std::filesystem::exists(MARIKO_PAYLOAD_PATH)) { brls::Application::crash("menus/errors/mariko_payload_missing"_i18n); } else { - CreateStagedFrames(text, url, erista, ams, hekate, text_hekate, hekate_url); + CreateStagedFrames(text, url, erista, ams, hekate && !pack, text_hekate, hekate_url); } }); this->RegisterListItemAction(listItem);