From 618fde49dd32de0ca987688257f8ee7b426e3cd7 Mon Sep 17 00:00:00 2001
From: flb <f.lb@gmx.com>
Date: Thu, 11 Feb 2021 13:45:35 +0100
Subject: [PATCH] Fixed non Atmosphere CFW being wrongly categorised as ams

---
 Makefile                        | 2 +-
 include/current_cfw.hpp         | 2 +-
 resources/i18n/en-US/menus.json | 1 +
 source/changelog_page.cpp       | 3 +++
 source/main.cpp                 | 3 +++
 source/main_frame.cpp           | 3 ---
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ea72f73..30fe815 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DATA		:=	data
 INCLUDES	:=	include lib/zipper/include
 APP_TITLE	:=	All-in-One Switch Updater
 APP_AUTHOR	:=	HamletDuFromage
-APP_VERSION :=  2.2.0
+APP_VERSION :=  2.2.1
 TARGET		:=	$(notdir $(CURDIR))
 
 ROMFS				:=	resources
diff --git a/include/current_cfw.hpp b/include/current_cfw.hpp
index 7b1db7b..964886b 100644
--- a/include/current_cfw.hpp
+++ b/include/current_cfw.hpp
@@ -4,4 +4,4 @@
 
 bool isServiceRunning(const char *serviceName);
 CFW getCFW();
-static CFW running_cfw = ams;
\ No newline at end of file
+extern CFW running_cfw;
\ No newline at end of file
diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json
index a48475a..893f348 100644
--- a/resources/i18n/en-US/menus.json
+++ b/resources/i18n/en-US/menus.json
@@ -72,6 +72,7 @@
     "v2_1_1_text":           "\uE016 Added a friendly reminder to reboot for new sigpatches to apply.\n\uE016 Changed the cheatslips cheatsheet view.",
     "v2_1_2_text":           "\uE016 Fixed wronge hekate link.",
     "v2_2_0_text":           "\uE016 For cheatslips.com, the build ID of a running game will now be fetched, allowing you to access cheatsheets even if the build ID isn't listed in the versions database.",
+    "v2_2_1_text":           "\uE016 Fixed non Atmosphere CFW being wrongly categorised as ams.",
     "Ok_button":    "Ok",
 
     "cheats_page.cpp":"",
diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp
index 9037d17..d5c63c5 100644
--- a/source/changelog_page.cpp
+++ b/source/changelog_page.cpp
@@ -97,6 +97,9 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true)
     verTitles.push_back("v2.2.0");
     changes.push_back("menus/v2_2_0_text"_i18n );
 
+    verTitles.push_back("v2.2.1");
+    changes.push_back("menus/v2_2_1_text"_i18n );
+
 
 
     int nbVersions = verTitles.size();
diff --git a/source/main.cpp b/source/main.cpp
index 02e4d25..30eec1f 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -6,12 +6,15 @@
 #include "main_frame.hpp"
 #include "constants.hpp"
 #include "utils.hpp"
+#include "current_cfw.hpp"
 
 namespace i18n = brls::i18n;
 using namespace i18n::literals;
 
 //TimeServiceType __nx_time_service_type = TimeServiceType_System;
 
+CFW running_cfw = getCFW();
+
 int main(int argc, char* argv[])
 {
     // Init the app
diff --git a/source/main_frame.cpp b/source/main_frame.cpp
index 51ee794..8f20351 100644
--- a/source/main_frame.cpp
+++ b/source/main_frame.cpp
@@ -1,5 +1,4 @@
 #include "main_frame.hpp"
-#include "current_cfw.hpp"
 #include "about_tab.hpp"
 #include "list_download_tab.hpp"
 #include "ams_tab.hpp"
@@ -22,8 +21,6 @@ MainFrame::MainFrame() : TabFrame()
         this->setFooterText("v" + std::string(APP_VERSION) + "menus/main_app"_i18n );
     else
         this->setFooterText("v" + std::string(APP_VERSION));
-
-    static CFW running_cfw = getCFW();
     
     json hideStatus;
     std::ifstream hideFile(HIDE_TABS_JSON);