Merge pull request #1881

1a666c30 simplewallet: catch case where no transactions are made (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-18 20:28:45 +02:00
commit 4fb39a9d20
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -2298,6 +2298,12 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
break; break;
} }
if (ptx_vector.empty())
{
fail_msg_writer() << tr("No outputs found, or daemon is not ready");
return true;
}
// if more than one tx necessary, prompt user to confirm // if more than one tx necessary, prompt user to confirm
if (m_wallet->always_confirm_transfers() || ptx_vector.size() > 1) if (m_wallet->always_confirm_transfers() || ptx_vector.size() > 1)
{ {
@ -2764,7 +2770,7 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_)
if (ptx_vector.empty()) if (ptx_vector.empty())
{ {
fail_msg_writer() << tr("No outputs found"); fail_msg_writer() << tr("No outputs found, or daemon is not ready");
return true; return true;
} }