zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #1778 - bitcartel:1762_segfault_miner, r=str4d 

Fixes #1762 segfault when miner is interrupted.

Closes #1762
This commit is contained in:
zkbot 2016-11-05 22:22:22 +00:00
parent ce71cd0984 5e9b555fed
commit 2648902a11
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/miner.cpp
View File

@ -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;
} }