UPSTREAM MERGE: Merge commit '62d40f1983' into elements-0.17

This commit is contained in:
Gregory Sanders 2019-01-23 12:52:04 -05:00
commit e3388ecfa2
7 changed files with 12 additions and 1051 deletions

View file

@ -767,8 +767,7 @@ static bool AppInitServers()
StartRPC();
if (!StartHTTPRPC())
return false;
if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST())
return false;
if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE)) StartREST();
StartHTTPServer();
return true;
}