Merge 97aadf98d0 into merged_master (Bitcoin PR #16117)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:50 +00:00
commit cc668250eb
17 changed files with 22 additions and 105 deletions

View file

@ -524,7 +524,7 @@ static int CommandLineRPC(int argc, char *argv[])
}
catch (const CConnectionFailed&) {
if (fWait)
MilliSleep(1000);
UninterruptibleSleep(std::chrono::milliseconds{1000});
else
throw;
}