Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

1 files changed, 16 insertions, 8 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 61791d4b4..cd1abff60 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
@@ -1258,14 +1258,22 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             JobsCollectionView.Filter = (job) =>
             {
-                Job j = job as Job;
-                return String.IsNullOrWhiteSpace(filter)
-                ||
-                j.Name.ToLower().Contains(filter) //Job name
-                ||
-                (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
-                ||
-                j.Length.ToString().Contains(filter); //Job length
+                try
+                {
+                    Job j = job as Job;
+                    return String.IsNullOrWhiteSpace(filter)
+                    ||
+                    j.Name.ToLower().Contains(filter) //Job name
+                    ||
+                    (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
+                    ||
+                    j.Length.ToString().Contains(filter); //Job length
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error filtering jobs.");
+                    return true;
+                }
             };
         }