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

1 files changed, 4 insertions, 3 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 569359066..1edbce641 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
@@ -979,7 +979,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             if (SelectedGroupHistory != null)
             {
                 LogManager.Log(String.Format("Parameters group {0} selected from history.", SelectedGroupHistory.Name));
-                RmlProcessParametersTableGroup = SelectedGroupHistory.CloneGroup();
+                RmlProcessParametersTableGroup = SelectedGroupHistory.Clone();
             }
         }
 
@@ -1329,7 +1329,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 if (RmlProcessParametersTableGroup != null)
                 {
-                    RmlProcessParametersTableGroup = RmlProcessParametersTableGroup.CloneGroup();
+                    RmlProcessParametersTableGroup = RmlProcessParametersTableGroup.Clone();
                     RmlProcessParametersTableGroup.ProcessParametersTables = RmlProcessParametersTableGroup.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection();
                 }
 
@@ -1385,7 +1385,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
                 {
-                    var newTable = table.CloneEntity();
+                    var newTable = table.Clone();
                     newTable.TableIndex = index++;
                     newTable.ProcessParametersTablesGroup = group;
                     tables.Add(newTable);
@@ -1647,6 +1647,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
                 Segment seg = new Segment();
+                seg.Job = ActiveJob;
                 seg.Name = "Untitled Segment";
                 seg.Length = 10;