PPC. Job creation dialog. Change RML list to RMLModel list to improve performance.

Related Work Items: #6847

1 files changed, 6 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index 6626ee569..5095801af 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -683,9 +683,8 @@ namespace Tango.PPC.Jobs.ViewModels
             try
             {
                 LogManager.Log("Editing the job details.");
-                JobCreationViewVM vm = new JobCreationViewVM(_spoolTypes.ToList(), _rmls.ToList(), JobModel.InterSegmentLength, true);
+                JobCreationViewVM vm = new JobCreationViewVM(_spoolTypes.ToList(), _rmls, JobModel.Rml.Guid, JobModel.InterSegmentLength, true);
                 vm.JobName = JobModel.Name;
-                vm.SelectedRML = JobModel.Rml;
                 vm.SelectedSpoolType = JobModel.SpoolType;
                 vm = await NotificationProvider.ShowDialog<JobCreationViewVM>(vm);
 
@@ -702,8 +701,11 @@ namespace Tango.PPC.Jobs.ViewModels
                 Job.SpoolType = vm.SelectedSpoolType;
                 JobModel.SpoolType = vm.SelectedSpoolType;//update  length!!!!
                 
-                SelectedRML = vm.SelectedRML;
-
+                if(vm.SelectedRML.Guid != SelectedRML.Guid)
+                {
+                    SelectedRML = _rmls.FirstOrDefault(x=>x.Guid == vm.SelectedRML.Guid);
+                }
+                
                 if (vm.IsDuplicate)
                 {
                     try