From 58db24e2b41a23499bca9343034128b3a5c12871 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Sun, 12 Feb 2023 01:08:49 +0100
Subject: [PATCH] make each extracted mcdf file unique

---
 MareSynchronos/Export/MareCharaFileManager.cs | 6 ++----
 MareSynchronos/MareSynchronos.csproj          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/MareSynchronos/Export/MareCharaFileManager.cs b/MareSynchronos/Export/MareCharaFileManager.cs
index d225c28..2294614 100644
--- a/MareSynchronos/Export/MareCharaFileManager.cs
+++ b/MareSynchronos/Export/MareCharaFileManager.cs
@@ -6,8 +6,6 @@ using MareSynchronos.Utils;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.MareConfiguration;
-using Lumina.Extensions;
-using static MareSynchronos.Export.MareCharaFileData;
 
 namespace MareSynchronos.Export;
 public class MareCharaFileManager
@@ -19,6 +17,7 @@ public class MareCharaFileManager
     private readonly MareCharaFileDataFactory _factory;
     public MareCharaFileHeader? LoadedCharaFile { get; private set; }
     public bool CurrentlyWorking { get; private set; } = false;
+    private static int GlobalFileCounter = 0;
 
     public MareCharaFileManager(FileCacheManager manager, IpcManager ipcManager, MareConfigService configService, DalamudUtil dalamudUtil)
     {
@@ -141,10 +140,9 @@ public class MareCharaFileManager
     private Dictionary<string, string> ExtractFilesFromCharaFile(MareCharaFileHeader charaFileHeader, BinaryReader reader)
     {
         Dictionary<string, string> gamePathToFilePath = new(StringComparer.Ordinal);
-        int i = 0;
         foreach (var fileData in charaFileHeader.CharaFileData.Files)
         {
-            var fileName = Path.Combine(_configService.Current.CacheFolder, "mare_" + (i++) + ".tmp");
+            var fileName = Path.Combine(_configService.Current.CacheFolder, "mare_" + (GlobalFileCounter++) + ".tmp");
             var length = fileData.Length;
             var bufferSize = 4 * 1024 * 1024;
             var buffer = new byte[bufferSize];
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 19e8e5d..ba2566f 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.7.24</Version>
+    <Version>0.7.25</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>