aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-10-11 18:50:38 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-10-11 18:50:38 +0300
commit3c798a187e66cf6fe6cc4ac15a943de112028fde (patch)
tree56b7c882d42ab6b247193ae25f83553ccc646717 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parentffc9932efa42c9485b9d0d53ee0b0602690f1c46 (diff)
parent0476dcfa43b3fa43997d8c763463350b81448107 (diff)
downloadTango-3c798a187e66cf6fe6cc4ac15a943de112028fde.tar.gz
Tango-3c798a187e66cf6fe6cc4ac15a943de112028fde.zip
MERGED PPC Update Future Branch !
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
};