DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 11:26:27 +00:00
Code Issues Releases Wiki Activity

Conditions - Added null-checks to accessors

Browse Source 
Conditions - Simplified operators, removing unnecessary expression trees
This commit is contained in:
SpoinkyNL committed 2020-09-24 00:02:53 +02:00
1 parent ad3581a93a
commit 33373bda57
24 files changed
+253 -311
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionPredicateViewModel.cs
+7 -2
View File
@@ -128,10 +128,15 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
if (DataModelConditionPredicate.Operator == null)
DataModelConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
SelectedOperator = DataModelConditionPredicate.Operator;
if (!SelectedOperator.SupportsRightSide)
{
DisposeRightSideStatic();
DisposeRightSideDynamic();
}
// Ensure the right side has the proper VM
var targetType = LeftSideSelectionViewModel?.SelectedPropertyViewModel?.PropertyInfo?.PropertyType;
if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && SelectedOperator.SupportsRightSide)
{
DisposeRightSideStatic();
if (RightSideSelectionViewModel == null)
@@ -147,7 +152,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
);
RightSideSelectionViewModel.FilterTypes = new[] {targetType};
}
else
else if (SelectedOperator.SupportsRightSide)
{
DisposeRightSideDynamic();
if (RightSideInputViewModel == null)