1 files changed, 36 insertions, 4 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 0742ca752..8f3d2a7e3 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
@@ -44,7 +44,19 @@ namespace Tango.MachineStudio.Developer.ViewModels
         public Machine SelectedMachine
         {
             get { return _selectedMachine; }
-            set { _selectedMachine = value; RaisePropertyChangedAuto(); OnMachineChanged(); InvalidateRelayCommands(); }
+            set
+            {
+                _selectedMachine = value;
+                RaisePropertyChangedAuto();
+                OnMachineChanged();
+                InvalidateRelayCommands();
+
+                if (_selectedMachine != null)
+                {
+                    _selectedMachine.Saved -= SelectedMachine_Saved;
+                    _selectedMachine.Saved += SelectedMachine_Saved;
+                }
+            }
         }
 
         private List<LiquidTypesRml> _liquidTypesRmls;
@@ -104,7 +116,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
         public Rml SelectedRML
         {
             get { return _selectedRML; }
-            set { _selectedRML = value; RaisePropertyChangedAuto(); InvalidateLiquidFactorsAndProcessTables(); InvalidateRelayCommands(); }
+            set
+            {
+                _selectedRML = value;
+                RaisePropertyChangedAuto();
+                InvalidateLiquidFactorsAndProcessTables();
+                InvalidateRelayCommands();
+            }
         }
 
         private bool _isSideBarOpened;
@@ -205,6 +223,20 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #endregion
 
+        #region Event Handlers
+
+        /// <summary>
+        /// Handles the Saved event of the SelectedMachine.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        private void SelectedMachine_Saved(object sender, EventArgs e)
+        {
+            InvalidateLiquidFactorsAndProcessTables();
+        }
+
+        #endregion
+
         #region Virtual Methods
 
         /// <summary>
@@ -278,7 +310,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
                 {
                     var newTable = table.CloneEntity();
-                    newTable.ProcessParametersTablesGroups = group;
+                    newTable.ProcessParametersTablesGroup = group;
                     tables.Add(newTable);
                 }
 
@@ -313,7 +345,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedRML != null && SelectedMachine != null)
             {
-                LiquidTypesRmls = SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidTypes).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
+                LiquidTypesRmls = SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
                 RmlProcessParametersTableGroup = SelectedRML.ProcessParametersTablesGroups.SingleOrDefault(x => x.Active);
 
                 if (RmlProcessParametersTableGroup != null)