From a2bf9a8e641fe0f8d9d7e5711c0bf408e88a6447 Mon Sep 17 00:00:00 2001
From: J-D-K <gerplefart@gmail.com>
Date: Tue, 31 Aug 2021 18:09:39 -0400
Subject: [PATCH] Fix legacy config loading

---
 Makefile       |  2 +-
 inc/data.h     |  2 +-
 src/cfg.cpp    | 22 ++++++++++++----------
 src/fsthrd.cpp |  7 +++++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index c8ab1ce..5f69c11 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ INCLUDES	:=	inc inc/ui
 EXEFS_SRC	:=	exefs_src
 APP_TITLE   :=  JKSV
 APP_AUTHOR  :=  JK
-APP_VERSION :=  08.19.2021
+APP_VERSION :=  08.31.2021
 ROMFS	    :=	romfs
 ICON		:=	icon.jpg
 
diff --git a/inc/data.h b/inc/data.h
index 13ddd9b..f0b5980 100644
--- a/inc/data.h
+++ b/inc/data.h
@@ -8,7 +8,7 @@
 #include "gfx.h"
 
 #define BLD_MON 8
-#define BLD_DAY 24
+#define BLD_DAY 31
 #define BLD_YEAR 2021
 
 namespace data
diff --git a/src/cfg.cpp b/src/cfg.cpp
index 144069e..58c5082 100644
--- a/src/cfg.cpp
+++ b/src/cfg.cpp
@@ -190,7 +190,7 @@ static void loadWorkDirLegacy()
         memset(tmp, 0, 256);
 
         FILE *getDir = fopen(workDirLegacy, "r");
-        fgets(tmp, FS_MAX_PATH, getDir);
+        fgets(tmp, 256, getDir);
         fclose(getDir);
         std::string tmpStr = tmp;
         util::stripChar('\n', tmpStr);
@@ -227,13 +227,13 @@ static void loadConfigLegacy()
         cfg::config["zip"] = cfgIn >> 51 & 1;
         cfg::config["langOverride"] = cfgIn >> 50 & 1;
         cfg::config["trashBin"] = cfgIn >> 49 & 1;
-        fs::delfile(cfgPath);
+        fs::delfile(legacyCfgPath.c_str());
     }
 }
 
 static void loadFavoritesLegacy()
 {
-    std::string legacyFavPath = fs::getWorkDir() + "cfg::favorites.txt";
+    std::string legacyFavPath = fs::getWorkDir() + "favorites.txt";
     if(fs::fileExists(legacyFavPath))
     {
         fs::dataFile fav(legacyFavPath);
@@ -246,7 +246,7 @@ static void loadFavoritesLegacy()
 
 static void loadBlacklistLegacy()
 {
-    std::string legacyBlPath = fs::getWorkDir() + "cfg::blacklist.txt";
+    std::string legacyBlPath = fs::getWorkDir() + "blacklist.txt";
     if(fs::fileExists(legacyBlPath))
     {
         fs::dataFile bl(legacyBlPath);
@@ -257,20 +257,19 @@ static void loadBlacklistLegacy()
     }
 }
 
-static void loadTitleDefs()
+static void loadTitleDefsLegacy()
 {
     std::string titleDefLegacy = fs::getWorkDir() + "titleDefs.txt";
     if(fs::fileExists(titleDefLegacy))
-        rename(titleDefLegacy.c_str(), titleDefPath);
-
-    if(fs::fileExists(titleDefPath))
     {
-        fs::dataFile getPaths(titleDefPath);
+        fs::dataFile getPaths(titleDefLegacy);
         while(getPaths.readNextLine(true))
         {
             uint64_t tid = strtoul(getPaths.getName().c_str(), NULL, 16);
             pathDefs[tid] = getPaths.getNextValueStr();
         }
+        getPaths.close();
+        fs::delfile(titleDefLegacy);
     }
 }
 
@@ -280,6 +279,7 @@ void cfg::loadConfig()
     loadConfigLegacy();
     loadFavoritesLegacy();
     loadBlacklistLegacy();
+    loadTitleDefsLegacy();
 
     if(fs::fileExists(cfgPath))
     {
@@ -380,10 +380,12 @@ void cfg::loadConfig()
                 case 18:
                     cfg::config["autoName"] = textToBool(cfgRead.getNextValueStr());
                     break;
+
+                default:
+                    break;
             }
         }
     }
-    loadTitleDefs();
 }
 
 static void savePathDefs()
diff --git a/src/fsthrd.cpp b/src/fsthrd.cpp
index 7f004bd..2079c29 100644
--- a/src/fsthrd.cpp
+++ b/src/fsthrd.cpp
@@ -110,8 +110,11 @@ void fs::createSaveData_t(void *a)
 
     FsSaveDataMetaInfo meta;
     memset(&meta, 0, sizeof(FsSaveDataMetaInfo));
-    meta.size = 0x40060;
-    meta.type = FsSaveDataMetaType_Thumbnail;
+    if(s->type != FsSaveDataType_Bcat)
+    {
+        meta.size = 0x40060;
+        meta.type = FsSaveDataMetaType_Thumbnail;
+    }
 
     Result res = 0;
     if(R_SUCCEEDED(res = fsCreateSaveDataFileSystem(&attr, &svCreate, &meta)))