1 files changed, 11 insertions, 0 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 d904c2e90..749a09023 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
@@ -1185,6 +1185,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     });
                 };
 
+                _jobHandler.Finalizing += (_, __) => 
+                {
+                    _speech.SpeakInfo("Finalizing job...");
+                    LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                    _eventLogger.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                };
+
                 _jobHandler.Completed += (x, e) =>
                 {
                     LogManager.Log(String.Format("Job {0} has completed.", RunningJob.Name));
@@ -1328,9 +1335,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ProcessParametersTablesGroup group = new ProcessParametersTablesGroup();
 
                 List<ProcessParametersTable> tables = new List<ProcessParametersTable>();
+
+                int index = 0;
+
                 foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
                 {
                     var newTable = table.CloneEntity();
+                    newTable.TableIndex = index++;
                     newTable.ProcessParametersTablesGroup = group;
                     tables.Add(newTable);
                 }