aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-12-04 17:05:07 +0200
committerRiccardo Spagni <ric@spagni.net>2018-12-04 17:05:08 +0200
commit90c9cd2051802ddbfda658b434b8d697147eb32f (patch)
treeeae2f6a801e1e1f29a0190decd296c9dfed22610
parentMerge pull request #4821 (diff)
parentsimplewallet: use is_transfer_unlocked instead of is_tx_spendtime_unlocked fo... (diff)
downloadmonero-90c9cd2051802ddbfda658b434b8d697147eb32f.tar.xz
Merge pull request #4817
0e2a5d75 simplewallet: use is_transfer_unlocked instead of is_tx_spendtime_unlocked for show_transfers (stoffu)
-rw-r--r--src/simplewallet/simplewallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index d9fd0c13e..784ceffe9 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -6844,7 +6844,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
std::string note = m_wallet->get_tx_note(pd.m_tx_hash);
std::string destination = m_wallet->get_subaddress_as_str({m_current_subaddress_account, pd.m_subaddr_index.minor});
const std::string type = pd.m_coinbase ? tr("block") : tr("in");
- const bool unlocked = m_wallet->is_tx_spendtime_unlocked(pd.m_unlock_time, pd.m_block_height);
+ const bool unlocked = m_wallet->is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height);
transfers.push_back({
pd.m_block_height,
pd.m_timestamp,