From 8171510c2e2588b2585fff39a4542444324cfbfd Mon Sep 17 00:00:00 2001 From: flb Date: Wed, 7 Oct 2020 02:51:29 +0200 Subject: [PATCH] Fixed self-update --- Makefile | 2 +- resources/i18n/en-US/menus.json | 4 ++-- resources/i18n/fr/menus.json | 4 ++-- resources/i18n/ja/menus.json | 4 ++-- resources/i18n/zh-CN/menus.json | 6 +++--- source/changelog_page.cpp | 4 ++-- source/tools_tab.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 32a4f8d..7f6123e 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.2.3 +APP_VERSION := 1.2.4 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 fd290e5..6ea902f 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -36,8 +36,8 @@ "v1_2_1_text": "\uE016 Added option to set a payload to /bootloader/update.bin", "v1_2_2": "v1.2.2", "v1_2_2_text": "\uE016 Added japanese localisation (thanks to github.com/yyoossk).", - "v1_2_3": "v1.2.3", - "v1_2_3_text": "\uE016 Fixed app self-update", + "v1_2_4": "v1.2.4", + "v1_2_4_text": "\uE016 Fixed app self-update", "Ok_button": "Ok", "cheats_page.cpp":"", diff --git a/resources/i18n/fr/menus.json b/resources/i18n/fr/menus.json index 234797a..b112dbb 100644 --- a/resources/i18n/fr/menus.json +++ b/resources/i18n/fr/menus.json @@ -36,8 +36,8 @@ "v1_2_1_text": "\uE016 Added option to set a payload to /bootloader/update.bin", "v1_2_2": "v1.2.2", "v1_2_2_text": "\uE016 Added japanese localisation (thanks to github.com/yyoossk).", - "v1_2_3": "v1.2.3", - "v1_2_3_text": "\uE016 Fixed app self-update", + "v1_2_4": "v1.2.4", + "v1_2_4_text": "\uE016 Fixed app self-update", "Ok_button": "Ok", "cheats_page.cpp":"", diff --git a/resources/i18n/ja/menus.json b/resources/i18n/ja/menus.json index 552aa53..fa4458f 100644 --- a/resources/i18n/ja/menus.json +++ b/resources/i18n/ja/menus.json @@ -36,8 +36,8 @@ "v1_2_1_text": "\uE016 Added option to set a payload to /bootloader/update.bin", "v1_2_2": "v1.2.2", "v1_2_2_text": "\uE016 Added japanese localisation (thanks to github.com/yyoossk).", - "v1_2_3": "v1.2.3", - "v1_2_3_text": "\uE016 Fixed app self-update", + "v1_2_4": "v1.2.4", + "v1_2_4_text": "\uE016 Fixed app self-update", "Ok_button": "決定", "cheats_page.cpp":"", diff --git a/resources/i18n/zh-CN/menus.json b/resources/i18n/zh-CN/menus.json index 1ab2907..3308c48 100644 --- a/resources/i18n/zh-CN/menus.json +++ b/resources/i18n/zh-CN/menus.json @@ -33,10 +33,10 @@ "v1_2_0_text": "\uE016 现在可以使用多种语言（感谢'github.com/tiansongyu').\n\uE016 目前支持中文和法文.", "v1_2_1": "v1.2.1", "v1_2_1_text": "\uE016 Added option to set a payload to /bootloader/update.bin", - "v1_2_2": "v1.2.3", + "v1_2_2": "v1.2.2", "v1_2_2_text": "\uE016 Added japanese localisation (thanks to github.com/yyoossk).", - "v1_2_3": "v1.2.3", - "v1_2_3_text": "\uE016 Fixed app self-update", + "v1_2_4": "v1.2.4", + "v1_2_4_text": "\uE016 Fixed app self-update", "Ok_button": "确定", "cheats_page.cpp":"", diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index 5107a5f..c376af7 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -40,8 +40,8 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) verTitles.push_back("menus/v1_2_2"_i18n ); changes.push_back("menus/v1_2_2_text"_i18n ); - verTitles.push_back("menus/v1_2_3"_i18n ); - changes.push_back("menus/v1_2_3_text"_i18n ); + verTitles.push_back("menus/v1_2_4"_i18n ); + changes.push_back("menus/v1_2_4_text"_i18n ); int nbVersions = verTitles.size(); items.reserve(nbVersions); diff --git a/source/tools_tab.cpp b/source/tools_tab.cpp index b8918dd..60fcf95 100644 --- a/source/tools_tab.cpp +++ b/source/tools_tab.cpp @@ -35,7 +35,7 @@ ToolsTab::ToolsTab(std::string tag) : brls::List() if(!tag.empty() && tag != APP_VERSION){ updateApp = new brls::ListItem("menus/tool_update"_i18n + tag +")"); std::string text("menus/tool_DownLoad"_i18n + std::string(APP_URL)); - updateApp->getClickEvent()->subscribe([&, text](brls::View* view) { + updateApp->getClickEvent()->subscribe([&, text, tag](brls::View* view) { brls::StagedAppletFrame* stagedFrame = new brls::StagedAppletFrame(); stagedFrame->setTitle("menus/tool_updating"_i18n ); stagedFrame->addStage(