aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-10-15 17:03:53 +0300
committerAvi Levkovich <avi@twine-s.com>2020-10-15 17:03:53 +0300
commitfd4f2d63b097dc9e189c9d30682bd6d5cc584d48 (patch)
tree8b911df6ec6f7c29ac85aa1dd8e331ed86f1e6bf /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parent6a3361f3a9e08b63b39589add64f5802932022f3 (diff)
parent1b2dfd51ae086f40bba2934e550d9d4b8cca9cce (diff)
downloadTango-fd4f2d63b097dc9e189c9d30682bd6d5cc584d48.tar.gz
Tango-fd4f2d63b097dc9e189c9d30682bd6d5cc584d48.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 8f02749da..fc0680d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1257,7 +1257,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
||
j.Name.ToLower().Contains(filter) //Job name
||
- j.User.Contact.FirstName.ToLower().Contains(filter) // User first name
+ (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
||
j.Length.ToString().Contains(filter); //Job length
};