Auto merge of #1778 - bitcartel:1762_segfault_miner, r=str4d
Fixes #1762 segfault when miner is interrupted. Closes #1762
This commit is contained in:
commit
2648902a11
|
@ -647,11 +647,13 @@ void static BitcoinMiner(CWallet *pwallet)
|
||||||
}
|
}
|
||||||
catch (const boost::thread_interrupted&)
|
catch (const boost::thread_interrupted&)
|
||||||
{
|
{
|
||||||
|
c.disconnect();
|
||||||
LogPrintf("ZcashMiner terminated\n");
|
LogPrintf("ZcashMiner terminated\n");
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
catch (const std::runtime_error &e)
|
catch (const std::runtime_error &e)
|
||||||
{
|
{
|
||||||
|
c.disconnect();
|
||||||
LogPrintf("ZcashMiner runtime error: %s\n", e.what());
|
LogPrintf("ZcashMiner runtime error: %s\n", e.what());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue