From f432ff835afe8ec37a00ee71efe497698d9cba6c Mon Sep 17 00:00:00 2001
From: flb <f.lb@gmx.com>
Date: Tue, 7 Sep 2021 15:44:12 +0200
Subject: [PATCH] Prepare for AMS 1.0.0

---
 Makefile                  | 2 +-
 aiosu-rcm                 | 2 +-
 build.sh                  | 8 --------
 source/app_page.cpp       | 4 ++--
 source/changelog_page.cpp | 3 +++
 source/extract.cpp        | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100755 build.sh

diff --git a/Makefile b/Makefile
index 740a66a..22e7e86 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.11.5
+APP_VERSION :=  2.12.0
 TARGET		:=	$(notdir $(CURDIR))
 
 ROMFS				:=	resources
diff --git a/aiosu-rcm b/aiosu-rcm
index 97f63e6..ce51c1f 160000
--- a/aiosu-rcm
+++ b/aiosu-rcm
@@ -1 +1 @@
-Subproject commit 97f63e66b18e3bb4892b7954b1169de32908f1d0
+Subproject commit ce51c1f22afcf98a9c10fa7013b505ae4e8a25be
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 73eb064..0000000
--- a/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cd $DIR
-pushd aiosu-forwarder
-make
-popd
-make -j$(nproc)
diff --git a/source/app_page.cpp b/source/app_page.cpp
index 5caea79..f8a1819 100644
--- a/source/app_page.cpp
+++ b/source/app_page.cpp
@@ -48,7 +48,6 @@ void AppPage::PopulatePage()
                 this->DeclareGameListItem(name, tid, &controlData);
             }
             free(controlData);
-            delete[] records;
         }
     }
     else {
@@ -60,6 +59,7 @@ void AppPage::PopulatePage()
         label = new brls::Label(brls::LabelStyle::SMALL, "menus/common/applet_mode_not_supported"_i18n, true);
         list->addView(label);
     }
+    delete[] records;
 
     this->CreateDownloadAllButton();
 
@@ -104,7 +104,7 @@ void AppPage::CreateDownloadAllButton()
 }
 
 u32 AppPage::InitControlData(NsApplicationControlData** controlData) {
-    free(controlData);
+    free(*controlData);
     *controlData = (NsApplicationControlData*)malloc(sizeof(NsApplicationControlData));
     if(*controlData == NULL) {
         return 300;
diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp
index 4d8d6ca..af9d17c 100644
--- a/source/changelog_page.cpp
+++ b/source/changelog_page.cpp
@@ -196,6 +196,9 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true)
     verTitles.push_back("v2.11.5");
     changes.push_back("\uE016 Update Japanese translation.\n\uE016 Do not show theme warning when downloading something that is not firmware files.");
 
+    verTitles.push_back("v2.12.0");
+    changes.push_back("\uE016 Prepare for AMS 1.0.0.\n\uE016 Update Japanese and French Translations.\n\uE016 Small bugfixes.");
+
     for(int i = verTitles.size() -1 ; i >= 0; i--){
         listItem = new brls::ListItem(verTitles[i]);
         change = changes[i];
diff --git a/source/extract.cpp b/source/extract.cpp
index e394394..6ece958 100644
--- a/source/extract.cpp
+++ b/source/extract.cpp
@@ -62,7 +62,7 @@ void extract(const std::string&  filename, const std::string& workingPath, int o
                 unzipper.extractEntry(entry.name);
             }
         }
-        else if(entry.name == "sept/payload.bin" || entry.name == "atmosphere/fusee-secondary.bin" || entry.name == "atmosphere/stratosphere.romfs"){
+        else if(entry.name == "sept/payload.bin" || entry.name == "atmosphere/fusee-secondary.bin" || entry.name == "atmosphere/stratosphere.romfs" || entry.name == "atmosphere/package3"){
             std::ofstream readonlyFile(entry.name + ".aio");
             unzipper.extractEntryToStream(entry.name, readonlyFile);
         }