Fixed items not being removed after merging them in Metadata Editor.

HerrKnarz · Oct 1, 2024 · bb4031f · bb4031f
1 parent 85de2f4
commit bb4031f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Generic/MetadataUtilities/Models/MergeRule.cs b/Generic/MetadataUtilities/Models/MergeRule.cs
@@ -43,10 +43,19 @@ public IEnumerable<Guid> Merge(List<Game> games = null, bool removeAfter = true)
                         games = API.Instance.Database.Games.ToList();
                     }
 
-                    result.AddMissing(item.ReplaceInDb(games, Type, Id, removeAfter));
+                    result.AddMissing(item.ReplaceInDb(games, Type, Id));
                 }
 
                 MetadataFunctions.UpdateGames(result);
+
+                if (removeAfter)
+                {
+                    foreach (var item in SourceObjects.Where(x =>
+                                 x.Id != Id && x.Id != default))
+                    {
+                        item.RemoveFromDb();
+                    }
+                }
             }
             catch (Exception ex)
             {

diff --git a/Generic/MetadataUtilities/Models/MetadataObject.cs b/Generic/MetadataUtilities/Models/MetadataObject.cs
@@ -251,8 +251,7 @@ public bool RemoveFromDb(bool checkIfUsed = true)
 
         public bool RemoveFromGame(Game game) => TypeManager is IEditableObjectType type && type.RemoveObjectFromGame(game, Id);
 
-        public IEnumerable<Guid> ReplaceInDb(List<Game> games, FieldType? newType = null, Guid? newId = null,
-            bool removeAfter = true)
+        public IEnumerable<Guid> ReplaceInDb(List<Game> games, FieldType? newType = null, Guid? newId = null)
         {
             IEnumerable<Guid> gameIds = new List<Guid>();
 
@@ -265,11 +264,6 @@ public IEnumerable<Guid> ReplaceInDb(List<Game> games, FieldType? newType = null
                 ? type.ReplaceDbObject(games, Id, newTypeManager, newId)
                 : type.ReplaceDbObject(games, Id);
 
-            if (removeAfter && type.RemoveDbObject(Id))
-            {
-                Id = default;
-            }
-
             return gameIds;
         }
 

diff --git a/Generic/MetadataUtilities/ViewModels/MetadataEditorViewModel.cs b/Generic/MetadataUtilities/ViewModels/MetadataEditorViewModel.cs
@@ -532,7 +532,7 @@ public MetadataUtilities Plugin
 
                 foreach (var item in SelectedItems)
                 {
-                    gamesAffected.AddMissing(item.ReplaceInDb(games, null, null, false).ToList());
+                    gamesAffected.AddMissing(item.ReplaceInDb(games).ToList());
                 }
 
                 if (gamesAffected.Count == 0)