diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-06 15:56:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-06 15:56:52 +0200 |
| commit | e1f0e6da5cd8d5bba8a74d6e4eb123999bdd7347 (patch) | |
| tree | 254dea9f97a54f8db7696b8572f9fcfb4361107e /src/wallet/wallet_rpc_server.cpp | |
| parent | Merge pull request #5390 (diff) | |
| parent | wallet: use original user address if we have a short payment id (diff) | |
| download | monero-e1f0e6da5cd8d5bba8a74d6e4eb123999bdd7347.tar.xz | |
Merge pull request #5340
16eda54b wallet: use original user address if we have a short payment id (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.cpp')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 95cda7f1e..e79b1a686 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -1173,7 +1173,7 @@ namespace tools { const cryptonote::tx_destination_entry &entry = cd.splitted_dsts[d]; std::string address = cryptonote::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 && address != entry.original) address = cryptonote::get_account_integrated_address_as_str(m_wallet->nettype(), entry.addr, payment_id8); auto i = dests.find(entry.addr); if (i == dests.end()) |