1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ThreadLoading/DefaultThreadLoadingService.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ThreadLoading/DefaultThreadLoadingService.cs
index a6479da63..4d6a848d3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ThreadLoading/DefaultThreadLoadingService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ThreadLoading/DefaultThreadLoadingService.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core.DI;
 using Tango.Integration.Operation;
+using Tango.PPC.Common.Build;
 using Tango.PPC.Common.Connection;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.Threading;
@@ -24,7 +26,8 @@ namespace Tango.PPC.UI.ThreadLoading
             _notificationsProvider = notificationsProvider;
             _machineProvider = machineProvider;
             _dispatcher = dispatcher;
-            _machineProvider.MachineOperator.ThreadLoadingStatusChanged += MachineOperator_ThreadLoadingStatusChanged;
+            if(false == TangoIOC.Default.GetInstance<IBuildProvider>().IsEureka)
+                 _machineProvider.MachineOperator.ThreadLoadingStatusChanged += MachineOperator_ThreadLoadingStatusChanged;
         }
 
         private void MachineOperator_ThreadLoadingStatusChanged(object sender, PMR.ThreadLoading.StartThreadLoadingResponse e)