1 files changed, 7 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index f6b31d93c..ed855d7b0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -305,9 +305,13 @@ namespace Tango.PPC.MachineSettings.ViewModels
         public PowerDownTime SelectedIdleTime
         {
             get { return _selectedIdleTime; }
-            set { _selectedIdleTime = value; RaisePropertyChangedAuto(); }
+            set { _selectedIdleTime = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PowerOffTimeVisible)); }
+        }
+        
+        public bool PowerOffTimeVisible
+        {
+            get { return SelectedIdleTime.Minutes != Common.PowerSavingModes.Never; }
         }
-
 
         #endregion
 
@@ -396,7 +400,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
                     await MachineProvider.MachineOperator.SetSpoolType((PMR.Printing.JobSpoolType)SelectedSpoolType.Code);
                 }
 
-                if (MachineProvider.IsConnected)
+                if (MachineProvider.IsConnected && BuildProvider.IsEureka)
                 {
                     try
                     {