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

1 files changed, 5 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index a186d3039..9dd6c4b79 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1571,13 +1571,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
         public override void OnNavigatedTo()
         {
             base.OnNavigatedTo();
-            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(true));
+            //_singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(true));
         }
 
         public override void OnNavigatedFrom()
         {
             base.OnNavigatedFrom();
-            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(false));
+            //_singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(false));
         }
 
         public override void OnShuttingDown()
@@ -1698,8 +1698,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             using (ObservablesContext db = ObservablesContext.CreateDefault())
                             {
-                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
-                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
+                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.Machine.ConfigurationGuid).Clone();
+                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid).Clone();
                             }
                         });
 
@@ -1795,7 +1795,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                 await Task.Factory.StartNew(() =>
                 {
-                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid);
                 });
 
                 foreach (var motorConfig in hw.HardwareMotors)