diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:13:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:13:10 +0200 |
| commit | 6f85b20d9206df2e6096ccfecb88ce2e9c6e4a45 (patch) | |
| tree | 5c0cc61f5c268d8ea1b224615e49874d50ea036b /src/wallet | |
| parent | Merge pull request #1282 (diff) | |
| parent | adding static_assert to pod functions in string tools (diff) | |
| download | monero-6f85b20d9206df2e6096ccfecb88ce2e9c6e4a45.tar.xz | |
Merge pull request #1283
4869db7 adding static_assert to pod functions in string tools (Lee Clagett)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 5ea8de5c7..8ea605375 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -527,14 +527,14 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, const s } else if (m_transfers[kit->second].m_spent || m_transfers[kit->second].amount() >= tx.vout[o].amount) { - LOG_ERROR("key image " << epee::string_tools::pod_to_hex(ki) + LOG_ERROR("key image " << epee::string_tools::pod_to_hex(kit->first) << " from received " << print_money(tx.vout[o].amount) << " output already exists with " << (m_transfers[kit->second].m_spent ? "spent" : "unspent") << " " << print_money(m_transfers[kit->second].amount()) << ", received output ignored"); } else { - LOG_ERROR("key image " << epee::string_tools::pod_to_hex(ki) + LOG_ERROR("key image " << epee::string_tools::pod_to_hex(kit->first) << " from received " << print_money(tx.vout[o].amount) << " output already exists with " << print_money(m_transfers[kit->second].amount()) << ", replacing with new output"); // The new larger output replaced a previous smaller one |