Merge branch 'V7_dev'

[modules/yacs.git] / src / engine / ElementaryNode.cxx

diff --git a/src/engine/ElementaryNode.cxx b/src/engine/ElementaryNode.cxx
index fb82250481f5dc94367b5da3feedefac2f88205a..129deaa1d701bbbc0466d8e007ea257854cb7697 100644 (file)
--- a/src/engine/ElementaryNode.cxx
+++ b/src/engine/ElementaryNode.cxx
@@ -92,17 +92,17 @@ void ElementaryNode::initCommonPartWithoutStateManagement(bool start)
   for(list<InputPort *>::iterator iter2=_setOfInputPort.begin();iter2!=_setOfInputPort.end();iter2++)
     (*iter2)->exInit(start);
   _inGate.exReset();
-  if(_state == YACS::DISABLED)
-    {
-      exDisabledState(); // to refresh propagation of DISABLED state
-      return;
-    }
 }
 
 void ElementaryNode::init(bool start)
 {
   DEBTRACE("ElementaryNode::init " << getName() << " " << start << " " << _state);
   initCommonPartWithoutStateManagement(start);
+  if(_state == YACS::DISABLED)
+    {
+      exDisabledState(); // to refresh propagation of DISABLED state
+      return ;
+    }
   setState(YACS::READY);
 }