Working on developer module...

1 files changed, 6 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
index eaa72541c..272bde432 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
@@ -66,7 +66,7 @@ namespace Tango.Integration.Operators
         /// <param name="value">if set to <c>true</c> [value].</param>
         protected virtual void OnEnableDiagnosticsChanged(bool value)
         {
-            if (value && State == TransportComponentState.Connected)
+            if (value && State == TransportComponentState.Connected && !_diagnosticsSent)
             {
                 SendContinuousRequest<PushDiagnosticsRequest, PushDiagnosticsResponse>(new TangoMessage<PushDiagnosticsRequest>(new PushDiagnosticsRequest()
                 {
@@ -117,6 +117,11 @@ namespace Tango.Integration.Operators
         {
             base.OnStateChanged(state);
 
+            if (state != TransportComponentState.Connected)
+            {
+                _diagnosticsSent = false;
+            }
+
             OnEnableDiagnosticsChanged(EnableDiagnostics);
         }