Merge pull request #236 from BUTR/dev

v2.3.4
BUTR · Nov 1, 2022 · 32c1329 · 32c1329
2 parents c20048e + 8919624
commit 32c1329
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/build/common.props b/build/common.props
@@ -4,7 +4,7 @@
   <!--Development Variables-->
   <PropertyGroup>
     <!--Module Version-->
-    <Version>2.3.3</Version>
+    <Version>2.3.4</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.1.0.67</HarmonyExtensionsVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.3.4
+Game Versions: v1.0.0
+* Another potential CTD fix
+---------------------------------------------------------------------------------------------------
 Version: 2.3.3
 Game Versions: v1.0.0
 * Added "Catch Native->Managed Code Exceptions"

diff --git a/src/Bannerlord.ButterLib/ButterLibSubModule.cs b/src/Bannerlord.ButterLib/ButterLibSubModule.cs
@@ -240,28 +240,32 @@ private void InitializeServices()
 
         private static void PerformMigration001()
         {
-            var oldConfigPath = Path.GetFullPath("Configs");
-            var oldPath = Path.Combine(oldConfigPath, "ModLogs");
-            var newPath = Path.Combine(PlatformFileHelperPCExtended.GetDirectoryFullPath(EngineFilePaths.ConfigsPath), "ModLogs");
-            if (Directory.Exists(oldPath) && Directory.Exists(newPath))
+            try
             {
-                foreach (var filePath in Directory.GetFiles(oldPath))
+                var oldConfigPath = Path.GetFullPath("Configs");
+                var oldPath = Path.Combine(oldConfigPath, "ModLogs");
+                var newPath = Path.Combine(PlatformFileHelperPCExtended.GetDirectoryFullPath(EngineFilePaths.ConfigsPath), "ModLogs");
+                if (Directory.Exists(oldPath) && Directory.Exists(newPath))
                 {
-                    var fileName = Path.GetFileName(filePath);
-                    var newFilePath = Path.Combine(newPath, fileName);
-                    try
+                    foreach (var filePath in Directory.GetFiles(oldPath))
                     {
-                        File.Copy(filePath, newFilePath, true);
-                        File.Delete(filePath);
+                        var fileName = Path.GetFileName(filePath);
+                        var newFilePath = Path.Combine(newPath, fileName);
+                        try
+                        {
+                            File.Copy(filePath, newFilePath, true);
+                            File.Delete(filePath);
+                        }
+                        catch (Exception) { }
                     }
-                    catch { }
-                }
 
-                if (Directory.GetFiles(oldPath) is { Length: 0 } && Directory.GetDirectories(oldPath) is { Length: 0})
-                    Directory.Delete(oldPath, true);
-                if (Directory.GetFiles(oldConfigPath) is { Length: 0 } && Directory.GetDirectories(oldConfigPath) is { Length: 0})
-                    Directory.Delete(oldConfigPath, true);
+                    if (Directory.GetFiles(oldPath) is { Length: 0 } && Directory.GetDirectories(oldPath) is { Length: 0})
+                        Directory.Delete(oldPath, true);
+                    if (Directory.GetFiles(oldConfigPath) is { Length: 0 } && Directory.GetDirectories(oldConfigPath) is { Length: 0})
+                        Directory.Delete(oldConfigPath, true);
+                }
             }
+            catch (Exception) { }
         }
     }
 }