Merged Eureka Branch !!!

1 files changed, 5 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index c5412e591..47ffe6f19 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -37,6 +37,7 @@ using Tango.BL.DTO;
 using Tango.PPC.Shared.Updates;
 using Tango.PPC.Shared.RemoteUpgrade;
 using Tango.Core.Threading;
+using Tango.PPC.Common.Build;
 
 namespace Tango.PPC.Common.MachineUpdate
 {
@@ -45,6 +46,7 @@ namespace Tango.PPC.Common.MachineUpdate
         private IPPCApplicationManager _app_manager;
         private IMachineProvider _machineProvider;
         private IPackageRunner _packageRunner;
+        private IBuildProvider _buildProvider;
         private PPCWebClient _client;
         private List<LogItemBase> _logs;
         private System.Timers.Timer _checkForUpdateTimer;
@@ -101,13 +103,14 @@ namespace Tango.PPC.Common.MachineUpdate
         /// Initializes a new instance of the <see cref="MachineUpdateManager"/> class.
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
-        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner, IPPCExternalBridgeService externalBridge)
+        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner, IPPCExternalBridgeService externalBridge, IBuildProvider buildProvider)
         {
             _client = ppcWebClient;
             _machineProvider = machineProvider;
             _app_manager = applicationManager;
             _app_manager.ApplicationReady += _app_manager_ApplicationReady;
             _packageRunner = packageRunner;
+            _buildProvider = buildProvider;
             _packageRunner.PackageProgress += _packageRunner_PackageProgress;
 
             _logs = new List<LogItemBase>();
@@ -702,7 +705,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     }
                 }
 
-                if (!op.CanPrint)
+                if (op.Status == MachineStatuses.Printing || op.Status == MachineStatuses.GettingReady)
                 {
                     throw LogManager.Log(new InvalidOperationException($"Could not perform an update while the machine is in {op.Status} status."));
                 }