From 7f374eab2aa2e3651be3052721e1b36e7cea34d8 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sun, 1 Dec 2019 23:31:05 +0100 Subject: [PATCH] fixed missing total field in get_recent_transfers struct --- src/gui/qt-daemon/application/daemon_backend.cpp | 2 +- src/wallet/wallet2.cpp | 3 ++- src/wallet/wallet2.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/qt-daemon/application/daemon_backend.cpp b/src/gui/qt-daemon/application/daemon_backend.cpp index dab77d8b..988c3cc9 100644 --- a/src/gui/qt-daemon/application/daemon_backend.cpp +++ b/src/gui/qt-daemon/application/daemon_backend.cpp @@ -716,7 +716,7 @@ std::string daemon_backend::get_recent_transfers(size_t wallet_id, uint64_t offs return API_RETURN_CODE_CORE_BUSY; } - w->get()->get_recent_transfers_history(tr_hist.history, offset, count); + w->get()->get_recent_transfers_history(tr_hist.history, offset, count, tr_hist.total_history_items); //workaround for missed fee for (auto & he : tr_hist.history) { diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 258e5668..db30ba58 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2515,7 +2515,7 @@ uint64_t wallet2::get_recent_transfers_total_count() return m_transfer_history.size(); } //---------------------------------------------------------------------------------------------------- -void wallet2::get_recent_transfers_history(std::vector& trs, size_t offset, size_t count) +void wallet2::get_recent_transfers_history(std::vector& trs, size_t offset, size_t count, uint64_t& total) { if (offset >= m_transfer_history.size()) return; @@ -2526,6 +2526,7 @@ void wallet2::get_recent_transfers_history(std::vector& trs, size_t offset, size_t count); + void get_recent_transfers_history(std::vector& trs, size_t offset, size_t count, uint64_t& total); uint64_t get_recent_transfers_total_count(); void get_unconfirmed_transfers(std::vector& trs); void init(const std::string& daemon_address = "http://localhost:8080");