From b5605ee3e90b4d4e5936f86247d01fcd9b4d3721 Mon Sep 17 00:00:00 2001
From: jakcron <jkrcarr@gmail.com>
Date: Sun, 17 Jun 2018 21:08:24 +0800
Subject: [PATCH] [nstool] Change order of XCI partition.

---
 programs/nstool/source/UserSettings.cpp | 12 ++++++------
 programs/nstool/source/UserSettings.h   |  6 +++---
 programs/nstool/source/main.cpp         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

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 <dir> --normal <dir> --secure <dir>] <.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 <dir>] <file>\n");
@@ -128,6 +128,11 @@ const sOptional<std::string>& UserSettings::getXciUpdatePath() const
 	return mXciUpdatePath;
 }
 
+const sOptional<std::string>& UserSettings::getXciLogoPath() const
+{
+	return mXciLogoPath;
+}
+
 const sOptional<std::string>& UserSettings::getXciNormalPath() const
 {
 	return mXciNormalPath;
@@ -138,11 +143,6 @@ const sOptional<std::string>& UserSettings::getXciSecurePath() const
 	return mXciSecurePath;
 }
 
-const sOptional<std::string>& UserSettings::getXciLogoPath() const
-{
-	return mXciLogoPath;
-}
-
 const sOptional<std::string>& 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<std::string>& getXciUpdatePath() const;
+	const sOptional<std::string>& getXciLogoPath() const;
 	const sOptional<std::string>& getXciNormalPath() const;
 	const sOptional<std::string>& getXciSecurePath() const;
-	const sOptional<std::string>& getXciLogoPath() const;
 	const sOptional<std::string>& getFsPath() const;
 	const sOptional<std::string>& getNcaPart0Path() const;
 	const sOptional<std::string>& getNcaPart1Path() const;
@@ -53,9 +53,9 @@ private:
 		sOptional<bool> minimal_output;
 		sOptional<bool> list_fs;
 		sOptional<std::string> update_path;
+		sOptional<std::string> logo_path;
 		sOptional<std::string> normal_path;
 		sOptional<std::string> secure_path;
-		sOptional<std::string> logo_path;
 		sOptional<std::string> fs_path;
 		sOptional<std::string> nca_titlekey;
 		sOptional<std::string> nca_bodykey;
@@ -78,9 +78,9 @@ private:
 
 	bool mListFs;
 	sOptional<std::string> mXciUpdatePath;
+	sOptional<std::string> mXciLogoPath;
 	sOptional<std::string> mXciNormalPath;
 	sOptional<std::string> mXciSecurePath;
-	sOptional<std::string> mXciLogoPath;
 	sOptional<std::string> mFsPath;
 
 	sOptional<std::string> 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();