aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorMirta <mirta@twine-s.com>2020-08-19 10:33:15 +0300
committerMirta <mirta@twine-s.com>2020-08-19 10:33:15 +0300
commite3bc7c2268cb25464d62dd56c7c265826c57d3c0 (patch)
tree59ff75312959109f826bf70f2e7e82e689bba1fd /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
parent7b6a64613bc18b1ce6c92fa9c335684ebaf00c90 (diff)
parent4702a085323fc2a6b403187867f9bf8c66bf45f6 (diff)
downloadTango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.tar.gz
Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.zip
resolved conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 229d62df7..cbb171cd6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -314,8 +314,7 @@ namespace Tango.MachineStudio.RML.ViewModels
{
Rml r = rml as Rml;
return String.IsNullOrWhiteSpace(RMLFilter)
- || r.Name.ToLower().Contains(RMLFilter.ToLower()) //Rml name
- || (r.MediaMaterial != null && r.MediaMaterial.Name.ToLower().Contains(RMLFilter.ToLower()));
+ || r.Name.ToLower().Contains(RMLFilter.ToLower());
};
}