diff options
| author | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
| commit | 2d2568104e8aaef6b90575284bf2e65315395da0 (patch) | |
| tree | 836c9ccd3d19a9b4097e5513fd6e2fd68e58f3c5 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels | |
| parent | 4902057feed8887c9ae5e05a1e618a1d085b6dde (diff) | |
| parent | ce5c7688337926ded0ee0778819f26b668cfc1d7 (diff) | |
| download | Tango-2d2568104e8aaef6b90575284bf2e65315395da0.tar.gz Tango-2d2568104e8aaef6b90575284bf2e65315395da0.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.cs | 2 |
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 }; |