diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-31 08:18:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-31 08:18:06 +0200 |
| commit | 76a765c967145e1ed26712376814bd695f42153a (patch) | |
| tree | 1e3f666d1b6a5646543d258c2962d8ffe35b705f /src/cryptonote_core/miner.cpp | |
| parent | Merge pull request #578 (diff) | |
| parent | blockchain: kill ioservice on scope end, rather than manually (diff) | |
| download | monero-76a765c967145e1ed26712376814bd695f42153a.tar.xz | |
Merge pull request #579
576effe blockchain: kill ioservice on scope end, rather than manually (moneromooo-monero)
ed5d017 miner: minor fixes on stop (moneromooo-monero)
b245215 core_tests: deinit core before destroying it (moneromooo-monero)
bc8a52e wallet: add a rescan_bc command and rescan_blockchain RPC (moneromooo-monero)
92ef6b5 wallet: protect against exceptions in the block pull thread (moneromooo-monero)
af21061 net_peerlist: move a couple functions from public to private (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/miner.cpp')
| -rw-r--r-- | src/cryptonote_core/miner.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cryptonote_core/miner.cpp b/src/cryptonote_core/miner.cpp index 00a474524..5fde94752 100644 --- a/src/cryptonote_core/miner.cpp +++ b/src/cryptonote_core/miner.cpp @@ -278,14 +278,17 @@ namespace cryptonote //----------------------------------------------------------------------------------------------------- bool miner::stop() { + if (!is_mining()) + return true; + send_stop_signal(); CRITICAL_REGION_LOCAL(m_threads_lock); BOOST_FOREACH(boost::thread& th, m_threads) th.join(); - m_threads.clear(); LOG_PRINT_L0("Mining has been stopped, " << m_threads.size() << " finished" ); + m_threads.clear(); return true; } //----------------------------------------------------------------------------------------------------- |