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

1 files changed, 8 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 5ae5c531c..5a5df0d0f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -196,7 +196,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
             MachinesProvider = new SuggestionProvider((filter) =>
             {
-                return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
+                try
+                {
+                    return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
+                }
+                catch
+                {
+                    return new List<Machine>();
+                }
             });
         }