1 files changed, 11 insertions, 10 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 458bc913a..686d95ccc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -992,16 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             YarnTypes = _active_context.YarnTypes.ToObservableCollection();
             IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection();
 
-            var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build();
-            Machines = machines.Select(x => new MachineModel()
-            {
-                Guid = x.Guid,
-                Name = x.Name,
-                SerialNumber = x.SerialNumber,
-                IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty),
-                LastUpdated = x.LastUpdated,
-                HasRMLTest = false
-            }).ToObservableCollection();
+            
 
         }
 
@@ -1058,6 +1049,16 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
                     _active_context = ObservablesContext.CreateDefault();
                     LoadRmlProperties();
+                    var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildListAsync();
+                    Machines = machines.Select(x => new MachineModel()
+                    {
+                        Guid = x.Guid,
+                        Name = x.Name,
+                        SerialNumber = x.SerialNumber,
+                        IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty),
+                        LastUpdated = x.LastUpdated,
+                        HasRMLTest = false
+                    }).ToObservableCollection();
 
                     if (guid == null)
                     {