check if devices element from layout XML is empty

SitecoreSupport · Mar 6, 2019 · b60235c · b60235c
1 parent 2b454fb
commit b60235c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Sitecore.Support.315324/InjectCompositeComponents.cs b/src/Sitecore.Support.315324/InjectCompositeComponents.cs
@@ -11,12 +11,16 @@ public class InjectCompositeComponents : Sitecore.XA.Feature.Composites.Pipeline
     public override IList<XElement> GetDevices(XElement layoutXml, ID contextDeviceId)
     {
       List<XElement> devices = layoutXml.Descendants("d").ToList();
-      IList<XElement> list = FilterDevicesByDeviceId(devices, contextDeviceId);
-      if (!list.Any() && Context.Device.FallbackDevice != null)
+      if (devices.Any())
       {
-        return GetDevices(layoutXml, Context.Device.FallbackDevice.ID);
+        IList<XElement> list = FilterDevicesByDeviceId(devices, contextDeviceId);
+        if (!list.Any() && Context.Device.FallbackDevice != null)
+        {
+          return GetDevices(layoutXml, Context.Device.FallbackDevice.ID);
+        }
+        return list;
       }
-      return list;
+      return new List<XElement>();
     }
   }
 }