diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:33:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:33:09 +0200 |
| commit | d6fb329653d422f6f525b347df025bb6178e7098 (patch) | |
| tree | ac6bc221b1adb01a28aa9451701d10f2e419b598 | |
| parent | Merge pull request #4553 (diff) | |
| parent | simplewallet: perform trivial error checks before password prompt (diff) | |
| download | monero-d6fb329653d422f6f525b347df025bb6178e7098.tar.xz | |
Merge pull request #4555
68e9744d simplewallet: perform trivial error checks before password prompt (xiphon)
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 4128a2789..3d92b2823 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -4715,8 +4715,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri if (!try_connect_to_daemon()) return true; - SCOPED_WALLET_UNLOCK(); - std::vector<std::string> local_args = args_; std::set<uint32_t> subaddr_indices; @@ -4936,6 +4934,8 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri } } + SCOPED_WALLET_UNLOCK(); + try { // figure out what tx will be necessary |