diff --git a/src/Artemis.Core/Plugins/Modules/DataModel.cs b/src/Artemis.Core/Plugins/Modules/DataModel.cs index b4c89b08b..d6730df88 100644 --- a/src/Artemis.Core/Plugins/Modules/DataModel.cs +++ b/src/Artemis.Core/Plugins/Modules/DataModel.cs @@ -57,6 +57,7 @@ namespace Artemis.Core.Modules /// /// Gets a read-only list of s targeting this data model /// + [DataModelIgnore] public ReadOnlyCollection ActivePaths => _activePaths.AsReadOnly(); /// diff --git a/src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs index baadf2a02..78bd7b625 100644 --- a/src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs +++ b/src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs @@ -62,9 +62,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions protected override List GetExtraRightSideDataModelViewModels() { - // Extra data models are expected to not have an empty root, so lets return the child - BindableCollection children = GetEventDataModel().Children; - return children.Cast().ToList(); + // Only the VM housing the event arguments is expected here which is a DataModelPropertiesViewModel + return GetEventDataModel().Children.Cast().ToList(); } private DataModelPropertiesViewModel GetEventDataModel() @@ -78,7 +77,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions public override void Evaluate() { - throw new NotImplementedException(); } } } \ No newline at end of file