change way to identify cfw

include/current_cfw.hpp

@@ -3,5 +3,6 @@
 #include "constants.hpp"
 
 bool isServiceRunning(const char *serviceName);
+Result smAtmosphereHasService(bool *out, SmServiceName name);
 CFW getCFW();
 const extern CFW running_cfw;

resources/i18n/en-US/menus.json

@@ -77,6 +77,7 @@
     "v2_3_1_text":           "\uE016 Files for batch copy are now copied according to the json order (formerly alphabetical order).",
     "v2_3_2_text":           "\uE016 Fixed batch copy not copying :^)",
     "v2_3_3_text":           "\uE016 Hide unsupported features for Mariko Switches",
+    "v2_3_4_text":           "\uE016 Minor fixes, refactored old switch-cheats updater code and changed way to detect CFW",
     "Ok_button":    "Ok",
 
     "cheats_page.cpp":"",

source/changelog_page.cpp

@@ -112,6 +112,9 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true)
     verTitles.push_back("v2.3.3");
     changes.push_back("menus/v2_3_3_text"_i18n );
 
+    verTitles.push_back("v2.3.4");
+    changes.push_back("menus/v2_3_4_text"_i18n );
+
     for(int i = verTitles.size() -1 ; i >= 0; i--){
         listItem = new brls::ListItem(verTitles[i]);
         change = changes[i];

source/current_cfw.cpp

@@ -12,8 +12,21 @@ bool isServiceRunning(const char *serviceName) {
     return running;
 };
 
+Result smAtmosphereHasService(bool *out, SmServiceName name) {
+    u8 tmp = 0;
+    Result rc = serviceDispatchInOut(smGetServiceSession(), 65100, name, tmp);
+    if (R_SUCCEEDED(rc) && out)
+        *out = tmp;
+    return rc;
+}
+
 CFW getCFW(){
-    if(isServiceRunning("rnx"))         return rnx;
+    bool res = false;
-    else if(isServiceRunning("tx"))     return sxos;
+    smAtmosphereHasService(&res, (SmServiceName) {"rnx"});
-    else                                return ams;
+    if(res) 
+        return rnx;
+    smAtmosphereHasService(&res, (SmServiceName) {"tx"});
+    if(res)
+        return sxos;
+    return ams;
 };

source/download_cheats_page.cpp

@@ -221,7 +221,7 @@ void DownloadCheatsPage::WriteCheats(uint64_t tid, std::string bid, std::string
     path += bid + ".txt";
     std::ofstream cheatFile;
     cheatFile.open(path, std::ios::app);
-    cheatFile << "\n" << cheatContent;
+    cheatFile << "\n\n" << cheatContent;
     std::ofstream updated;
     updated.open(UPDATED_TITLES_PATH, std::ios::app);
     updated << "\n" << tidstr;