diff options
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 20c50f79d23..1c0ef752ac7 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1825,7 +1825,8 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) _timer = new DelayedStart(this); _node->getWaitQueue()->add(_timer, IceUtil::Time::seconds(_disableOnFailure)); } - else if(_state == Inactive && _activation == Always && previous != Activating && previous != ActivationTimeout) + else if(_state == Inactive && _activation == Always && + previous != Activating && previous != ActivationTimeout && previous != WaitForActivation) { if(!_start) { |