From 9d03729e8aed7d7e23244f1e4f6695a960eb8aae Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Fri, 24 May 2019 15:24:10 -0500
Subject: [PATCH] Misc fixes

---
 src/LibHac/Fs/DirectorySaveDataFile.cs       | 2 --
 src/LibHac/Fs/DirectorySaveDataFileSystem.cs | 2 +-
 src/LibHac/Fs/NcaUtils/Nca.cs                | 3 ++-
 src/LibHac/Util.cs                           | 2 +-
 src/hactoolnet/ProcessNca.cs                 | 2 --
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/LibHac/Fs/DirectorySaveDataFile.cs b/src/LibHac/Fs/DirectorySaveDataFile.cs
index 2f0bd6c4..5cebc989 100644
--- a/src/LibHac/Fs/DirectorySaveDataFile.cs
+++ b/src/LibHac/Fs/DirectorySaveDataFile.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace LibHac.Fs
 {
diff --git a/src/LibHac/Fs/DirectorySaveDataFileSystem.cs b/src/LibHac/Fs/DirectorySaveDataFileSystem.cs
index 5997fb36..24b7391e 100644
--- a/src/LibHac/Fs/DirectorySaveDataFileSystem.cs
+++ b/src/LibHac/Fs/DirectorySaveDataFileSystem.cs
@@ -39,7 +39,7 @@ namespace LibHac.Fs
 
             lock (Locker)
             {
-                BaseFs.CreateDirectory(path);
+                BaseFs.CreateDirectory(fullPath);
             }
         }
 
diff --git a/src/LibHac/Fs/NcaUtils/Nca.cs b/src/LibHac/Fs/NcaUtils/Nca.cs
index 4bc06ff7..2f86ca53 100644
--- a/src/LibHac/Fs/NcaUtils/Nca.cs
+++ b/src/LibHac/Fs/NcaUtils/Nca.cs
@@ -129,11 +129,12 @@ namespace LibHac.Fs.NcaUtils
             }
         }
 
-        // ReSharper disable once UnusedParameter.Local
+        // ReSharper disable UnusedParameter.Local
         private IStorage OpenAesXtsStorage(IStorage baseStorage, int index)
         {
             throw new NotImplementedException("NCA sections using XTS are not supported yet.");
         }
+        // ReSharper restore UnusedParameter.Local
 
         private IStorage OpenAesCtrStorage(IStorage baseStorage, int index)
         {
diff --git a/src/LibHac/Util.cs b/src/LibHac/Util.cs
index de08f97a..a4a5e1c6 100644
--- a/src/LibHac/Util.cs
+++ b/src/LibHac/Util.cs
@@ -491,7 +491,7 @@ namespace LibHac
                 case 4: return "5.0.0-5.1.0";
                 case 5: return "6.0.0-6.0.1";
                 case 6: return "6.2.0";
-                case 7: return "7.0.0";
+                case 7: return "7.0.0-8.0.1";
                 default: return "Unknown";
             }
         }
diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs
index 8c59aa6f..16674476 100644
--- a/src/hactoolnet/ProcessNca.cs
+++ b/src/hactoolnet/ProcessNca.cs
@@ -31,7 +31,6 @@ namespace hactoolnet
                 {
                     IStorage baseFile = new LocalStorage(ctx.Options.BaseNca, FileAccess.Read);
                     baseNca = new Nca(ctx.Keyset, baseFile);
-                    ncaHolder.BaseNca = baseNca;
                 }
 
                 for (int i = 0; i < 3; i++)
@@ -288,7 +287,6 @@ namespace hactoolnet
         private class NcaHolder
         {
             public Nca Nca;
-            public Nca BaseNca;
             public Validity[] Validities = new Validity[4];
         }
     }