diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-10-09 14:29:16 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-10-09 14:29:16 +0200 |
commit | 0589209eb444348f59507e0b104509d8a63e5f05 (patch) | |
tree | 0639a8fac12acc82faac4ab9217a92fcb08bb51d /src/wallet | |
parent | Merge pull request #1182 (diff) | |
parent | wallet: do not announce pool txes as money spent/received (yet) (diff) | |
download | monero-0589209eb444348f59507e0b104509d8a63e5f05.tar.xz |
Merge pull request #1191
9f31e2d wallet: do not announce pool txes as money spent/received (yet) (moneromooo-monero)
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/wallet2.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 61c3a5149..98dbc4fd6 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -583,11 +583,14 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, const s std::string(", expected ") + print_money(td.amount())); } amount = td.amount(); - LOG_PRINT_L0("Spent money: " << print_money(amount) << ", with tx: " << txid()); tx_money_spent_in_ins += amount; - set_spent(it->second, height); - if (0 != m_callback) - m_callback->on_money_spent(height, tx, amount, tx); + if (!pool) + { + LOG_PRINT_L0("Spent money: " << print_money(amount) << ", with tx: " << txid()); + set_spent(it->second, height); + if (0 != m_callback) + m_callback->on_money_spent(height, tx, amount, tx); + } } } |