wownero
/
wownero
7
13
Fork 13
Code Issues 8 Pull Requests Releases 41 Wiki Activity

wallet2: do not assume imported outputs must be non empty

Browse Source
pull/470/head
moneromooo-monero 2 years ago
parent 5b98bebad1
commit 4b7eb573b2
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
src/wallet/wallet2.cpp
Unescape View File

@ -6606,7 +6606,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
{ {
if (!exported_txs.new_transfers.second.empty()) if (!exported_txs.new_transfers.second.empty())
import_outputs(exported_txs.new_transfers); import_outputs(exported_txs.new_transfers);
else else if (exported_txs.transfers.second.empty())
import_outputs(exported_txs.transfers); import_outputs(exported_txs.transfers);
// sign the transactions // sign the transactions
@ -13395,7 +13395,7 @@ size_t wallet2::import_outputs_from_str(const std::string &outputs_st)
outputs.second = {}; outputs.second = {};
} }
imported_outputs = new_outputs.second.empty() ? import_outputs(outputs) : import_outputs(new_outputs); imported_outputs = !new_outputs.second.empty() ? import_outputs(new_outputs) : !outputs.second.empty() ? import_outputs(outputs) : 0;
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {

Write Preview
Loading…
Cancel
Save