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

Fixes #1762 segfault when miner is interrupted. Closes #1762
2016-11-05 22:22:22 +00:00 · 2016-11-05 22:22:22 +00:00 · 2648902a11
parent ce71cd0984 5e9b555fed
commit 2648902a11
1 changed files with 2 additions and 0 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@ -647,11 +647,13 @@ void static BitcoinMiner(CWallet *pwallet)
    }
    catch (const boost::thread_interrupted&)
    {
+        c.disconnect();
        LogPrintf("ZcashMiner terminated\n");
        throw;
    }
    catch (const std::runtime_error &e)
    {
+        c.disconnect();
        LogPrintf("ZcashMiner runtime error: %s\n", e.what());
        return;
    }