Merge branch 'private-dev'

nowfloats · Aug 30, 2017 · 026aa60 · 026aa60
2 parents 7696d03 + e9414ef
commit 026aa60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ANAConversationStudio/Helpers/Utilities.cs b/ANAConversationStudio/Helpers/Utilities.cs
@@ -315,6 +315,7 @@ public static Models.ChatFlowSearchItem SearchNode(this ChatNode node, string se
         }
         public static bool IsMatch(this string text, string searchKeywords)
         {
+            if (string.IsNullOrWhiteSpace(text) || string.IsNullOrWhiteSpace(searchKeywords)) return false;
             return Regex.IsMatch(text,
                 string.Join("|", searchKeywords.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries)
                     .Select(x => x.Trim())), RegexOptions.IgnoreCase);

diff --git a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
@@ -546,6 +546,7 @@ public ObservableCollection<ChatFlowSearchItem> SearchResults
 
         public void SearchInNodes(string keywords)
         {
+            if (string.IsNullOrWhiteSpace(keywords)) return;
             SearchResults = new ObservableCollection<ChatFlowSearchItem>(Network.Nodes.Select(node => node.ChatNode.SearchNode(keywords)).Where(x => x != null));
             if (SearchResults.Count == 0)
                 SearchResults = new ObservableCollection<ChatFlowSearchItem>