diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-24 08:56:52 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-24 08:58:59 +0000 |
| commit | 16eda54b38217750829292ca91b8c1239f96964e (patch) | |
| tree | 844ef011e8c3118f9f99dc7b63ed3ebb5f146ac6 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #5267 (diff) | |
| download | monero-16eda54b38217750829292ca91b8c1239f96964e.tar.xz | |
wallet: use original user address if we have a short payment id
Diffstat (limited to '')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index f390b7675..95c9e5369 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -6569,7 +6569,7 @@ bool simple_wallet::accept_loaded_tx(const std::function<size_t()> get_num_txes, { const tx_destination_entry &entry = cd.splitted_dsts[d]; std::string address, standard_address = get_account_address_as_str(m_wallet->nettype(), entry.is_subaddress, entry.addr); - if (has_encrypted_payment_id && !entry.is_subaddress) + if (has_encrypted_payment_id && !entry.is_subaddress && standard_address != entry.original) { address = get_account_integrated_address_as_str(m_wallet->nettype(), entry.addr, payment_id8); address += std::string(" (" + standard_address + " with encrypted payment id " + epee::string_tools::pod_to_hex(payment_id8) + ")"); |