From 4022cf12a01a999d42b6013df0cb536f9017f5f0 Mon Sep 17 00:00:00 2001
From: azakhi <azak.halilibrahim@gmail.com>
Date: Mon, 1 Oct 2018 15:29:35 +0300
Subject: [PATCH] Fix crash caused by null selected blocks (#92)

* Fixed a crash caused by null selected blocks
---
 Filtration/ViewModels/ItemFilterScriptViewModel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index 154dab6..12bda5d 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -379,7 +379,7 @@ namespace Filtration.ViewModels
         {
             for (var i = 0; i < SelectedBlockViewModels.Count; i++)
             {
-                if (!ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
+                if (SelectedBlockViewModels[i] == null || !ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
                 {
                     SelectedBlockViewModels.RemoveAt(i--);
                 }
@@ -554,6 +554,8 @@ namespace Filtration.ViewModels
 
         public bool CanModifySelectedBlocks()
         {
+            ValidateSelectedBlocks();
+
             if (SelectedBlockViewModels.Count < 1)
                 return false;
 
@@ -570,6 +572,9 @@ namespace Filtration.ViewModels
 
         public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
         {
+            if (itemFilterBlock == null)
+                return false;
+
             if (itemFilterBlock is IItemFilterBlockViewModel)
                 return true;