From 98c8bf8cd6710293a70a7dd67c4b362b319599c2 Mon Sep 17 00:00:00 2001
From: RattleSN4K3 <RattleSN4K3@gmail.com>
Date: Sat, 24 May 2025 18:48:54 +0200
Subject: [PATCH] Fix storing save game files into "Files" subfolder for
 single-file save-paths

---
 LANCommander.SDK/Utilities/SavePackager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/LANCommander.SDK/Utilities/SavePackager.cs b/LANCommander.SDK/Utilities/SavePackager.cs
index b1357722..8e463ce6 100644
--- a/LANCommander.SDK/Utilities/SavePackager.cs
+++ b/LANCommander.SDK/Utilities/SavePackager.cs
@@ -136,16 +136,19 @@ public class SavePacker : IDisposable
         var absoluteLocalPath = path.ExpandEnvironmentVariables(_installDirectory);
         var absoluteFullLocalPath = Path.Combine(absoluteLocalWorkingDirectory, absoluteLocalPath);
 
+        var archiveBaseFolder = $"Files/{savePathId}/";
         if (Directory.Exists(absoluteFullLocalPath))
         {
             foreach (var file in Directory.GetFiles(absoluteFullLocalPath, "*", SearchOption.AllDirectories))
             {
-                _archive.AddEntry($"Files/{savePathId}/{GetArchiveEntryName(file, absoluteLocalWorkingDirectory).TrimStart('/')}", file);
+                var archivePath = $"{archiveBaseFolder}{GetArchiveEntryName(file, absoluteLocalWorkingDirectory).TrimStart('/')}";
+                _archive.AddEntry(archivePath, file);
             }
         }
         else if (File.Exists(absoluteFullLocalPath))
         {
-            _archive.AddEntry(GetArchiveEntryName(absoluteFullLocalPath, absoluteLocalWorkingDirectory), absoluteFullLocalPath);
+            var archivePath = $"{archiveBaseFolder}{GetArchiveEntryName(absoluteFullLocalPath, absoluteLocalWorkingDirectory).TrimStart('/')}";
+            _archive.AddEntry(archivePath, absoluteFullLocalPath);
         }
     }