Update 2.3.2.7

Author: Lunaretic

xivModdingFramework/SqPack/FileTypes/Index.cs

@@ -51,7 +51,7 @@ public Index(DirectoryInfo gameDirectory)
         /// </summary>
         /// <param name="dataFile">The data file to update the index for.</param>
         /// <param name="datNum">The dat number to update to.</param>
-        public void UpdateIndexDatCount(XivDataFile dataFile, int datNum)
+        public void UpdateIndexDatCount(XivDataFile dataFile, int datNum, bool alreadySemaphoreLocked = false)
         {
             var datCount = (byte)(datNum + 1);
 
@@ -63,7 +63,10 @@ public void UpdateIndexDatCount(XivDataFile dataFile, int datNum)
 
             foreach (var indexPath in indexPaths)
             {
-                _semaphoreSlim.Wait();
+                if (!alreadySemaphoreLocked)
+                {
+                    _semaphoreSlim.Wait();
+                }
                 try
                 {
                     using (var bw = new BinaryWriter(File.OpenWrite(indexPath)))
@@ -74,7 +77,10 @@ public void UpdateIndexDatCount(XivDataFile dataFile, int datNum)
                 }
                 finally
                 {
-                    _semaphoreSlim.Release();
+                    if (!alreadySemaphoreLocked)
+                    {
+                        _semaphoreSlim.Release();
+                    }
                 }
             }
         }
@@ -790,6 +796,10 @@ public async Task SaveIndexFile(IndexFile index, bool alreadySemaphoreLocked = f
                     }
                 }
 
+
+                var _dat = new Dat(XivCache.GameInfo.GameDirectory);
+                var largestDatNum = _dat.GetLargestDatNumber(index.DataFile);
+                UpdateIndexDatCount(index.DataFile, largestDatNum, true);
             }
             finally
             {
@@ -798,10 +808,6 @@ public async Task SaveIndexFile(IndexFile index, bool alreadySemaphoreLocked = f
                     _semaphoreSlim.Release();
                 }
             }
-
-            var _dat = new Dat(XivCache.GameInfo.GameDirectory);
-            var largestDatNum = _dat.GetLargestDatNumber(index.DataFile);
-            UpdateIndexDatCount(index.DataFile, largestDatNum);
         }