1 files changed, 8 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index f8320e1f2..23dd4ecd7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using Tango.BL;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Core.DI;
@@ -547,8 +548,13 @@ namespace Tango.MachineStudio.UI.ViewModels
                             {
                                 try
                                 {
-                                    var configuration = ApplicationManager.ConnectedMachine.Machine.Configuration;
-                                    await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(configuration.HardwareVersion, configuration);
+                                    using (ObservablesContext db = ObservablesContext.CreateDefault())
+                                    {
+                                        var config = db.GetConfiguration(s => s.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid);
+                                        var hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+
+                                        await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(hw, config);
+                                    }
                                     NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
                                 }
                                 catch (Exception ex)