1 files changed, 8 insertions, 1 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index ea24e32eb..f53649518 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -136,7 +136,14 @@ bool t_daemon::run(bool interactive)
   {
     throw std::runtime_error{"Can't run stopped daemon"};
   }
-  tools::signal_handler::install(std::bind(&daemonize::t_daemon::stop_p2p, this));
+
+  std::atomic<bool> stop(false);
+  boost::thread([&stop, this] {
+    while (!stop)
+      epee::misc_utils::sleep_no_w(100);
+    this->stop_p2p();
+  }).detach();
+  tools::signal_handler::install([&stop](int){ stop = true; });
 
   try
   {