aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-07-13 13:13:10 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-07-18 23:03:09 +0300
commit10c06ddac72559eb986868e69ae7f4861c48cd15 (patch)
treea19b02976b2e3860e1b62f7f2e270ff319cbe3e0
parentWalletListener functionality (diff)
downloadmonero-10c06ddac72559eb986868e69ae7f4861c48cd15.tar.xz
wallet_api: segfault on refresh fixed
Diffstat (limited to '')
-rw-r--r--src/wallet/api/wallet.cpp4
-rw-r--r--src/wallet/wallet2_api.h10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index f71cbd85b..15cffe2af 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -634,8 +634,8 @@ void WalletImpl::doRefresh()
std::lock_guard<std::mutex> guarg(m_refreshMutex2);
try {
m_wallet->refresh();
- if (m_walletListener) {
- m_walletListener->refreshed();
+ if (m_wallet2Callback->getListener()) {
+ m_wallet2Callback->getListener()->refreshed();
}
} catch (const std::exception &e) {
m_status = Status_Error;
diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h
index a51d38a71..f6c573673 100644
--- a/src/wallet/wallet2_api.h
+++ b/src/wallet/wallet2_api.h
@@ -189,10 +189,14 @@ struct Wallet
static std::string genPaymentId();
static bool paymentIdValid(const std::string &paiment_id);
- // TODO?
- // virtual uint64_t unlockedDustBalance() const = 0;
+ /**
+ * @brief refresh - refreshes the wallet, updating transactions from daemon
+ * @return - true if refreshed successfully;
+ */
virtual bool refresh() = 0;
-
+ /**
+ * @brief refreshAsync - refreshes wallet asynchronously.
+ */
virtual void refreshAsync() = 0;
/*!
* \brief createTransaction creates transaction. if dst_addr is an integrated address, payment_id is ignored