Fix logic error in migration rule (#120)

IllusionMods · Sep 23, 2020 · 84121f6 · 84121f6
1 parent b777021
commit 84121f6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Core_Sideloader/UniversalAutoResolver/Core.UAR.cs b/src/Core_Sideloader/UniversalAutoResolver/Core.UAR.cs
@@ -384,23 +384,23 @@ internal static void MigrateData(ResolveInfo extResolve, ChaListDefine.CategoryN
                 return;
             }
 
-            foreach (var migrationInfo in migrationInfoList.Where(x => x.MigrationType == MigrationType.MigrateAll))
+            foreach (var migrationInfo in migrationInfoList.Where(x => x.IDOld == extResolve.Slot && categoryNo == extResolve.CategoryNo))
             {
                 if (Sideloader.GetManifest(migrationInfo.GUIDNew) != null)
                 {
-                    Sideloader.Logger.LogInfo($"Migrating GUID {migrationInfo.GUIDOld} -> {migrationInfo.GUIDNew}");
+                    Sideloader.Logger.LogInfo($"Migrating {migrationInfo.GUIDOld}:{migrationInfo.IDOld} -> {migrationInfo.GUIDNew}:{migrationInfo.IDNew}");
                     extResolve.GUID = migrationInfo.GUIDNew;
+                    extResolve.Slot = migrationInfo.IDNew;
                     return;
                 }
             }
 
-            foreach (var migrationInfo in migrationInfoList.Where(x => x.IDOld == extResolve.Slot && categoryNo == extResolve.CategoryNo))
+            foreach (var migrationInfo in migrationInfoList.Where(x => x.MigrationType == MigrationType.MigrateAll))
             {
                 if (Sideloader.GetManifest(migrationInfo.GUIDNew) != null)
                 {
-                    Sideloader.Logger.LogInfo($"Migrating {migrationInfo.GUIDOld}:{migrationInfo.IDOld} -> {migrationInfo.GUIDNew}:{migrationInfo.IDNew}");
+                    Sideloader.Logger.LogInfo($"Migrating GUID {migrationInfo.GUIDOld} -> {migrationInfo.GUIDNew}");
                     extResolve.GUID = migrationInfo.GUIDNew;
-                    extResolve.Slot = migrationInfo.IDNew;
                     return;
                 }
             }