Merge branch 'develop' into feature

This commit is contained in:
JoelKatz
2013-05-29 17:17:19 -07:00

View File

@@ -522,6 +522,12 @@ bool serverOkay(std::string& reason)
return false;
}
if (theApp->isShutdown())
{
reason = "Server is shutting down";
return false;
}
if (theApp->getOPs().isNeedNetworkLedger())
{
reason = "Not synchronized with network yet";