diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:24:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:24:49 +0200 |
| commit | b1df7f114d068b17e074d95459c97bc9c76fc8bc (patch) | |
| tree | f4846d1af178f208c4aac1429713356e1ff6ab2e /src | |
| parent | Merge pull request #1709 (diff) | |
| parent | daemon: fix crash on exit when mining (diff) | |
| download | monero-b1df7f114d068b17e074d95459c97bc9c76fc8bc.tar.xz | |
Merge pull request #1711
cf2e75eb daemon: fix crash on exit when mining (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/daemon.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index e40136a71..19013cbc8 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -141,6 +141,7 @@ bool t_daemon::run(bool interactive) } mp_internals->rpc.stop(); + mp_internals->core.get().get_miner().stop(); MGINFO("Node stopped."); return true; } @@ -162,6 +163,7 @@ void t_daemon::stop() { throw std::runtime_error{"Can't stop stopped daemon"}; } + mp_internals->core.get().get_miner().stop(); mp_internals->p2p.stop(); mp_internals->rpc.stop(); mp_internals.reset(nullptr); // Ensure resources are cleaned up before we return |