diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-11-29 13:02:01 +0000 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-11-29 23:24:56 +0000 |
commit | d68a63e40439850cfc66f8525b35986a6371fa47 (patch) | |
tree | 200f691c7fcadfa81169b92ec500a72d3100e219 /src/common/util.h | |
parent | Merge pull request #511 (diff) | |
download | monero-d68a63e40439850cfc66f8525b35986a6371fa47.tar.xz |
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.
Diffstat (limited to 'src/common/util.h')
-rw-r--r-- | src/common/util.h | 12 |
1 files changed, 6 insertions, 6 deletions
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<std::mutex> lock(m_mutex); - m_handler(); + m_handler(type); } /*! \brief where the installed handler is stored */ - static std::function<void(void)> m_handler; + static std::function<void(int)> m_handler; }; } |