Merge pull request #1097

5f5d727 wallet: fix empty tx in corner case sending nothing (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-09-18 17:42:09 +02:00
commit a6914c140c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -3279,6 +3279,9 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
} }
LOG_PRINT_L2("Starting with " << unused_transfers_indices.size() << " non-dust outputs and " << unused_dust_indices.size() << " dust outputs"); LOG_PRINT_L2("Starting with " << unused_transfers_indices.size() << " non-dust outputs and " << unused_dust_indices.size() << " dust outputs");
if (unused_dust_indices.empty() && unused_transfers_indices.empty())
return std::vector<wallet2::pending_tx>();
// start with an empty tx // start with an empty tx
txes.push_back(TX()); txes.push_back(TX());
accumulated_fee = 0; accumulated_fee = 0;
@ -3515,6 +3518,9 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_all(const cryptono
} }
LOG_PRINT_L2("Starting with " << unused_transfers_indices.size() << " non-dust outputs and " << unused_dust_indices.size() << " dust outputs"); LOG_PRINT_L2("Starting with " << unused_transfers_indices.size() << " non-dust outputs and " << unused_dust_indices.size() << " dust outputs");
if (unused_dust_indices.empty() && unused_transfers_indices.empty())
return std::vector<wallet2::pending_tx>();
// start with an empty tx // start with an empty tx
txes.push_back(TX()); txes.push_back(TX());
accumulated_fee = 0; accumulated_fee = 0;