diff options
author | Jethro Grassie <jtg@xtrabass.com> | 2017-06-22 08:15:18 -0400 |
---|---|---|
committer | Jethro Grassie <jtg@xtrabass.com> | 2017-06-25 10:48:02 -0400 |
commit | be9d4f041117da7afa610328f13b7bfddadd12c8 (patch) | |
tree | db8d6c9921a161fc692e13e6a9341c72b0f1a089 /src/simplewallet/simplewallet.cpp | |
parent | Merge pull request #2111 (diff) | |
download | monero-be9d4f041117da7afa610328f13b7bfddadd12c8.tar.xz |
Fix multiline wallet cli output with readline
monero-wallet-cli commands which have multine output sometimes causes
issues with the readline support. This patch fixes show_transfers,
payments and incoming_transfers.
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
-rw-r--r-- | src/simplewallet/simplewallet.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 4d53f063e..7ef215bf0 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -62,6 +62,15 @@ #include "wallet/wallet_args.h" #include <stdexcept> +#ifdef HAVE_READLINE + #include "readline_buffer.h" + #define PAUSE_READLINE() \ + rdln::suspend_readline pause_readline; \ + std::cout << std::endl +#else + #define PAUSE_READLINE() +#endif + using namespace std; using namespace epee; using namespace cryptonote; @@ -1831,6 +1840,8 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args } } + PAUSE_READLINE(); + tools::wallet2::transfer_container transfers; m_wallet->get_transfers(transfers); @@ -1891,6 +1902,8 @@ bool simple_wallet::show_payments(const std::vector<std::string> &args) LOCK_IDLE_SCOPE(); + PAUSE_READLINE(); + message_writer() << boost::format("%68s%68s%12s%21s%16s") % tr("payment") % tr("transaction") % tr("height") % tr("amount") % tr("unlock time"); @@ -3716,6 +3729,8 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_) std::multimap<uint64_t, std::pair<bool,std::string>> output; + PAUSE_READLINE(); + if (in) { std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments; m_wallet->get_payments(payments, min_height, max_height); |