aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet/simplewallet.h
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-11-29 13:02:01 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-11-29 23:24:56 +0000
commitd68a63e40439850cfc66f8525b35986a6371fa47 (patch)
tree200f691c7fcadfa81169b92ec500a72d3100e219 /src/simplewallet/simplewallet.h
parentMerge pull request #511 (diff)
downloadmonero-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/simplewallet/simplewallet.h')
-rw-r--r--src/simplewallet/simplewallet.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index be510ffb2..dd1e59d6c 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -68,6 +68,7 @@ namespace cryptonote
bool deinit();
bool run();
void stop();
+ void interrupt();
//wallet *create_wallet();
bool process_command(const std::vector<std::string> &args);
@@ -134,6 +135,7 @@ namespace cryptonote
uint64_t get_daemon_blockchain_height(std::string& err);
bool try_connect_to_daemon();
bool ask_wallet_create_if_needed();
+
/*!
* \brief Prints the seed with a nice message
* \param seed seed to print
@@ -238,5 +240,6 @@ namespace cryptonote
std::thread m_auto_refresh_thread;
std::mutex m_auto_refresh_mutex;
std::condition_variable m_auto_refresh_cond;
+ std::atomic<bool> m_in_manual_refresh;
};
}