mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
wallet2: do not assume imported outputs must be non empty
This commit is contained in:
parent
67b6d6ae2c
commit
692f1d4e3d
@ -6606,7 +6606,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
|
||||
{
|
||||
if (!exported_txs.new_transfers.second.empty())
|
||||
import_outputs(exported_txs.new_transfers);
|
||||
else
|
||||
else if (exported_txs.transfers.second.empty())
|
||||
import_outputs(exported_txs.transfers);
|
||||
|
||||
// sign the transactions
|
||||
@ -13395,7 +13395,7 @@ size_t wallet2::import_outputs_from_str(const std::string &outputs_st)
|
||||
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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user