diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-03 16:59:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-03 16:59:32 +0200 |
| commit | 4e92ef4aa4f2272cf4187420e6d5e4aa331ff6e3 (patch) | |
| tree | ba8ab56785b5204d3918efd8c46d85a749e24dfe /src/wallet/wallet2.cpp | |
| parent | e24cd86c1819172a15fc2b329de1e7f35a253c72 (diff) | |
| parent | 9ae33b51fbcb0db42bed383f757772c71187e38c (diff) | |
| download | monzero-core-4e92ef4aa4f2272cf4187420e6d5e4aa331ff6e3.tar.gz monzero-core-4e92ef4aa4f2272cf4187420e6d5e4aa331ff6e3.tar.xz monzero-core-4e92ef4aa4f2272cf4187420e6d5e4aa331ff6e3.zip | |
Merge pull request #1831
9ae33b51 wallet api: fix parameters in wallet2callbackImpl (Jaquee)
1cf2f5a5 use txid in wallet2::process_new_transaction() (Jaquee)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 3b987c7d6..888c158c5 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1029,7 +1029,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote payment.m_unlock_time = tx.unlock_time; payment.m_timestamp = ts; if (pool) { - m_unconfirmed_payments.emplace(txid(), payment); + m_unconfirmed_payments.emplace(txid, payment); if (0 != m_callback) m_callback->on_unconfirmed_money_received(height, txid, tx, payment.m_amount); } |