aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-10-07 19:52:05 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-10-07 19:52:05 +0100
commit9f31e2d8c0e78b283d063d2e3a72f69053bb8d78 (patch)
treec1fa2a59bbc9186fd21edd313ed4de2fc18dc206 /src/wallet
parentMerge pull request #1120 (diff)
downloadmonero-9f31e2d8c0e78b283d063d2e3a72f69053bb8d78.tar.xz
wallet: do not announce pool txes as money spent/received (yet)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet2.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index e3736bc3d..c4b5248c4 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);
+ }
}
}