1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
index fa78430bd..0e4ec8fa4 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs
@@ -432,7 +432,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 {
                     await Task.Delay(200);
                 }
-                var selectedRmlGuid = Settings.DefaultRmlGuid;
+                var selectedRmlGuid = Settings.DefaultRmlGuid ?? _rmls.First().Guid;
                 Job job = new Job();
                 job.LastUpdated = DateTime.UtcNow;
                 job.JobSource = JobSource.Local;
@@ -442,7 +442,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.CreationDate = DateTime.UtcNow;
                 job.JobStatus = JobStatuses.Draft;
 
-                var selectedSpoolTypeGuid = Settings.SpoolTypeGuid;
+                var selectedSpoolTypeGuid = Settings.SpoolTypeGuid ?? _spoolTypes.First().Guid;
 
                 if (BuildProvider.IsEureka)
                 {
@@ -715,9 +715,9 @@ namespace Tango.PPC.Jobs.ViewModels
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
                 _catalogs = await new CatalogsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
-                //_rmls = await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
-                _rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection();
-                _spoolTypes = db.SpoolTypes.ToObservableCollection();
+                _rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection();
+                //_rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection();
+                _spoolTypes = await MachineProvider.Machine.GetSiteSpoolTypes(db);
             }
 
             MachineDataSynchronizer.SynchronizationEnded += MachineDataSynchronizer_SynchronizationEnded;