- fix when target object in block/image merge is already null.

KevinJump · Apr 22, 2024 · 94ad0a6 · 94ad0a6
1 parent 1fb533d
commit 94ad0a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/uSync.Core/Roots/Configs/BlockGridConfigMerger.cs b/uSync.Core/Roots/Configs/BlockGridConfigMerger.cs
@@ -29,6 +29,9 @@ public virtual object GetMergedConfig(string root, string target)
             x => x.Name,
             x => x.Name?.StartsWith(_removedLabel) == true);
 
+        if (targetConfig.BlockGroups.Length == 0 && targetConfig.Blocks.Length == 0)
+            return null;
+
         return targetConfig;
     }
 

diff --git a/uSync.Core/Roots/Configs/SyncConfigMergerBase.cs b/uSync.Core/Roots/Configs/SyncConfigMergerBase.cs
@@ -27,7 +27,7 @@ protected TConfig TryGetConfiguration<TConfig>(string value)
 
     protected static TObject[] MergeObjects<TObject, TKey>(TObject[] rootObject, TObject[] targetObject, Func<TObject, TKey> keySelector, Predicate<TObject> predicate)
     {
-        var targetObjectKeys = targetObject.Select(keySelector);
+        var targetObjectKeys = targetObject?.Select(keySelector) ?? [];
 
         if (targetObjectKeys is IEnumerable<string> targetStrings)
         {
@@ -37,7 +37,7 @@ protected static TObject[] MergeObjects<TObject, TKey>(TObject[] rootObject, TOb
         var validRootObjects = rootObject?.Where(x => !targetObjectKeys.Contains(keySelector(x))).ToList()
             ?? [];
 
-        var mergedObject = targetObject.ToList();
+        var mergedObject = targetObject?.ToList() ?? [];
 
         if (validRootObjects.Count > 0)
         {