aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2018-10-10 20:01:04 +0000
committerxiphon <xiphon@protonmail.com>2018-10-10 20:01:04 +0000
commit68e9744d4465cf809b1b68234876ade8705de9e3 (patch)
treec6c951a57c258a76d385cfbce02142bf51f1dcb1
parentMerge pull request #4543 (diff)
downloadmonero-68e9744d4465cf809b1b68234876ade8705de9e3.tar.xz
simplewallet: perform trivial error checks before password prompt
-rw-r--r--src/simplewallet/simplewallet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 4ec7e3eb4..8d24bb9fb 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