From d68a63e40439850cfc66f8525b35986a6371fa47 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 29 Nov 2015 13:02:01 +0000 Subject: wallet: cancellable refresh ^C while in manual refresh will cancel the refresh, since that's often an annoying thing to have to wait for. Also, a manual refresh command will interrupt any running background refresh and take over, rather than wait for the background refresh to be done, and look to be hanging. --- src/common/util.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/common/util.h') diff --git a/src/common/util.h b/src/common/util.h index 236a0b6f0..937f7e44d 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -130,7 +130,7 @@ namespace tools { if (CTRL_C_EVENT == type || CTRL_BREAK_EVENT == type) { - handle_signal(); + handle_signal(type); } else { @@ -141,21 +141,21 @@ namespace tools } #else /*! \brief handler for NIX */ - static void posix_handler(int /*type*/) + static void posix_handler(int type) { - handle_signal(); + handle_signal(type); } #endif /*! \brief calles m_handler */ - static void handle_signal() + static void handle_signal(int type) { static std::mutex m_mutex; std::unique_lock lock(m_mutex); - m_handler(); + m_handler(type); } /*! \brief where the installed handler is stored */ - static std::function m_handler; + static std::function m_handler; }; } -- cgit v1.2.3