Merge pull request #4555

68e9744d simplewallet: perform trivial error checks before password prompt (xiphon)
This commit is contained in:
Riccardo Spagni 2018-10-26 22:33:09 +02:00
commit d6fb329653
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -4715,8 +4715,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
SCOPED_WALLET_UNLOCK();
std::vector<std::string> local_args = args_; std::vector<std::string> local_args = args_;
std::set<uint32_t> subaddr_indices; 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 try
{ {
// figure out what tx will be necessary // figure out what tx will be necessary