diff --git a/programs/nstool/source/UserSettings.cpp b/programs/nstool/source/UserSettings.cpp
index f6229ee..4087558 100644
--- a/programs/nstool/source/UserSettings.cpp
+++ b/programs/nstool/source/UserSettings.cpp
@@ -49,8 +49,8 @@ void UserSettings::showHelp()
printf(" nstool [--listfs] [--update
--normal --secure ] <.xci file>\n");
printf(" --listfs Print file system in embedded partitions\n");
printf(" --update Extract \"update\" partition to directory\n");
- printf(" --normal Extract \"normal\" partition to directory\n");
printf(" --logo Extract \"logo\" partition to directory\n");
+ printf(" --normal Extract \"normal\" partition to directory\n");
printf(" --secure Extract \"secure\" partition to directory\n");
printf("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Ninendo Submission Package)\n");
printf(" nstool [--listfs] [--fsdir ] \n");
@@ -128,6 +128,11 @@ const sOptional& UserSettings::getXciUpdatePath() const
return mXciUpdatePath;
}
+const sOptional& UserSettings::getXciLogoPath() const
+{
+ return mXciLogoPath;
+}
+
const sOptional& UserSettings::getXciNormalPath() const
{
return mXciNormalPath;
@@ -138,11 +143,6 @@ const sOptional& UserSettings::getXciSecurePath() const
return mXciSecurePath;
}
-const sOptional& UserSettings::getXciLogoPath() const
-{
- return mXciLogoPath;
-}
-
const sOptional& UserSettings::getFsPath() const
{
return mFsPath;
diff --git a/programs/nstool/source/UserSettings.h b/programs/nstool/source/UserSettings.h
index b876ff8..c8d28f9 100644
--- a/programs/nstool/source/UserSettings.h
+++ b/programs/nstool/source/UserSettings.h
@@ -27,9 +27,9 @@ public:
// specialised paths
const sOptional& getXciUpdatePath() const;
+ const sOptional& getXciLogoPath() const;
const sOptional& getXciNormalPath() const;
const sOptional& getXciSecurePath() const;
- const sOptional& getXciLogoPath() const;
const sOptional& getFsPath() const;
const sOptional& getNcaPart0Path() const;
const sOptional& getNcaPart1Path() const;
@@ -53,9 +53,9 @@ private:
sOptional minimal_output;
sOptional list_fs;
sOptional update_path;
+ sOptional logo_path;
sOptional normal_path;
sOptional secure_path;
- sOptional logo_path;
sOptional fs_path;
sOptional nca_titlekey;
sOptional nca_bodykey;
@@ -78,9 +78,9 @@ private:
bool mListFs;
sOptional mXciUpdatePath;
+ sOptional mXciLogoPath;
sOptional mXciNormalPath;
sOptional mXciSecurePath;
- sOptional mXciLogoPath;
sOptional mFsPath;
sOptional mNcaPart0Path;
diff --git a/programs/nstool/source/main.cpp b/programs/nstool/source/main.cpp
index 4821fa4..0edeffd 100644
--- a/programs/nstool/source/main.cpp
+++ b/programs/nstool/source/main.cpp
@@ -30,12 +30,12 @@ int main(int argc, char** argv)
if (user_set.getXciUpdatePath().isSet)
xci.setPartitionForExtract(nx::xci::kUpdatePartitionStr, user_set.getXciUpdatePath().var);
+ if (user_set.getXciLogoPath().isSet)
+ xci.setPartitionForExtract(nx::xci::kLogoPartitionStr, user_set.getXciLogoPath().var);
if (user_set.getXciNormalPath().isSet)
xci.setPartitionForExtract(nx::xci::kNormalPartitionStr, user_set.getXciNormalPath().var);
if (user_set.getXciSecurePath().isSet)
xci.setPartitionForExtract(nx::xci::kSecurePartitionStr, user_set.getXciSecurePath().var);
- if (user_set.getXciLogoPath().isSet)
- xci.setPartitionForExtract(nx::xci::kLogoPartitionStr, user_set.getXciLogoPath().var);
xci.setListFs(user_set.isListFs());
xci.process();