From dd9f7810cc02974246e10fc95e81c7dca982e611 Mon Sep 17 00:00:00 2001 From: flb Date: Mon, 18 Jan 2021 17:24:36 +0100 Subject: [PATCH] Fixed switch not rebooting to hekate payload after updating Hekate --- Makefile | 2 +- resources/i18n/en-US/menus.json | 4 +++- source/changelog_page.cpp | 3 +++ source/extract.cpp | 6 +++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 76fc536..ba075d4 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ DATA := data INCLUDES := include lib/zipper/include APP_TITLE := All-in-One Switch Updater APP_AUTHOR := HamletDuFromage -APP_VERSION := 1.4.2 +APP_VERSION := 1.4.3 TARGET := $(notdir $(CURDIR))-v$(APP_VERSION) ROMFS := resources diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json index 2f3f446..60cbcf0 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -53,7 +53,9 @@ "v1_4_1": "v1.4.1", "v1_4_1_text": "\uE016 Fixed misleading display in internet settings page.", "v1_4_2": "v1.4.2", - "v1_4_2_text": "\uE016 (hopefully) fixed unreliable copy of payloads", + "v1_4_2_text": "\uE016 (hopefully) fixed unreliable copy of payloads.", + "v1_4_3": "v1.4.3", + "v1_4_3_text": "\uE016 Fixed switch not rebooting to hekate payload after updating.", "Ok_button": "Ok", "cheats_page.cpp":"", diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index b44e5f5..0d113ff 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -67,6 +67,9 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) verTitles.push_back("menus/v1_4_2"_i18n ); changes.push_back("menus/v1_4_2_text"_i18n ); + verTitles.push_back("menus/v1_4_3"_i18n ); + changes.push_back("menus/v1_4_3_text"_i18n ); + int nbVersions = verTitles.size(); items.reserve(nbVersions); for(int i = nbVersions -1 ; i >= 0; i--){ diff --git a/source/extract.cpp b/source/extract.cpp index 82c9530..7fb8805 100644 --- a/source/extract.cpp +++ b/source/extract.cpp @@ -42,8 +42,12 @@ void extract(const char * filename, const char* workingPath, int overwriteInis){ unzipper.extractEntry(entries[i].name, CONFIG_PATH_UNZIP); } else if(entries[i].name.substr(0, 13) == "hekate_ctcaer"){ + std::cout << "Found hekate payload : " << entries[i].name << std::endl; unzipper.extractEntry(entries[i].name); - CopyFile(entries[i].name.c_str(), UPDATE_BIN_PATH); + int c = 0; + while(R_FAILED(CopyFile(("/" + entries[i].name).c_str(), UPDATE_BIN_PATH)) && c < 10){ + std::cout << c++ << std::endl; + } } else{ unzipper.extractEntry(entries[i].name);