Merge pull request #6123
bba7c24
Avoid crash on start in TestBlockValidity with gen=1. (Gregory Maxwell)
This commit is contained in:
commit
484821870b
|
@ -453,8 +453,16 @@ void static BitcoinMiner(CWallet *pwallet)
|
||||||
if (chainparams.MiningRequiresPeers()) {
|
if (chainparams.MiningRequiresPeers()) {
|
||||||
// Busy-wait for the network to come online so we don't waste time mining
|
// Busy-wait for the network to come online so we don't waste time mining
|
||||||
// on an obsolete chain. In regtest mode we expect to fly solo.
|
// on an obsolete chain. In regtest mode we expect to fly solo.
|
||||||
while (vNodes.empty())
|
do {
|
||||||
|
bool fvNodesEmpty;
|
||||||
|
{
|
||||||
|
LOCK(cs_vNodes);
|
||||||
|
fvNodesEmpty = vNodes.empty();
|
||||||
|
}
|
||||||
|
if (!fvNodesEmpty && !IsInitialBlockDownload())
|
||||||
|
break;
|
||||||
MilliSleep(1000);
|
MilliSleep(1000);
|
||||||
|
} while (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -533,6 +541,11 @@ void static BitcoinMiner(CWallet *pwallet)
|
||||||
LogPrintf("BitcoinMiner terminated\n");
|
LogPrintf("BitcoinMiner terminated\n");
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
catch (const std::runtime_error &e)
|
||||||
|
{
|
||||||
|
LogPrintf("BitcoinMiner runtime error: %s\n", e.what());
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads)
|
void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads)
|
||||||
|
|
Loading…
Reference in a new issue