Final updates

- Revert save # parse change - Work around issues with corrupted ContentCatalog.txt - Set final version
ModOrganizer2 · Jun 23, 2024 · c2c8395 · c2c8395
1 parent 6aff3ad
commit c2c8395
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/gamestarfield.cpp b/src/gamestarfield.cpp
@@ -155,7 +155,7 @@ QString GameStarfield::description() const
 
 MOBase::VersionInfo GameStarfield::version() const
 {
-  return VersionInfo(1, 1, 0, VersionInfo::RELEASE_CANDIDATE);
+  return VersionInfo(1, 1, 0, VersionInfo::RELEASE_FINAL);
 }
 
 QList<PluginSetting> GameStarfield::settings() const

diff --git a/src/starfieldsavegame.cpp b/src/starfieldsavegame.cpp
@@ -61,9 +61,9 @@ void StarfieldSaveGame::fetchInformationFields(
   unsigned int version;
   // file.read(fileID, 12);
   headerSize  = file.readInt(12);
-  saveNumber  = file.readInt();
-  saveVersion = file.readChar();
   version     = file.readInt();
+  saveVersion = file.readChar();
+  saveNumber  = file.readInt();
   file.read(playerName);
 
   unsigned int temp;

diff --git a/src/starfieldunmanagedmods.cpp b/src/starfieldunmanagedmods.cpp
@@ -61,7 +61,9 @@ StarfieldUnmanagedMods::parseContentCatalog() const
                 "/ContentCatalog.txt");
   std::map<QString, StarfieldUnmanagedMods::ContentCatalog> contentCatalog;
   if (content.open(QIODevice::OpenModeFlag::ReadOnly)) {
-    auto contentData = content.readAll();
+    auto contentData      = content.readAll();
+    QString convertedData = QString::fromLatin1(contentData);
+    contentData           = convertedData.toUtf8();
     QJsonParseError jsonError;
     QJsonDocument contentDoc = QJsonDocument::fromJson(contentData, &jsonError);
     if (jsonError.error) {