1 files changed, 10 insertions, 0 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 8eaa1f360..fd28d5b1e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -444,6 +444,11 @@ namespace Tango.MachineStudio.UI.ViewModels
                                 {
                                     try
                                     {
+                                        if (!x.SelectedMachine.EnableDiagnostics)
+                                        {
+                                            x.SelectedMachine.EnableEmbeddedDebugging = false;
+                                        }
+
                                         await x.SelectedMachine.Connect();
 
                                         var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password);
@@ -479,6 +484,11 @@ namespace Tango.MachineStudio.UI.ViewModels
                                     {
                                         try
                                         {
+                                            if (!x.SelectedMachine.EnableDiagnostics)
+                                            {
+                                                x.SelectedMachine.EnableEmbeddedDebugging = false;
+                                            }
+
                                             await x.SelectedMachine.Connect();
                                             x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber;
                                             ApplicationManager.ConnectedMachine = x.SelectedMachine;