aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-07-08 17:21:31 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-07-08 17:21:31 -0500
commit03761950156e8e29963beda5f57add7bf9047171 (patch)
treeeabe1691432ceba4c5108c8a666374e972bb1b6d
parentMerge pull request #6599 (diff)
parentrpc: fix comparison of seconds vs microseconds (diff)
downloadmonero-03761950156e8e29963beda5f57add7bf9047171.tar.xz
Merge pull request #6611
dc1a053 rpc: fix comparison of seconds vs microseconds (moneromooo-monero)
-rw-r--r--src/rpc/rpc_payment.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/rpc_payment.cpp b/src/rpc/rpc_payment.cpp
index 6cd52523f..ab6831382 100644
--- a/src/rpc/rpc_payment.cpp
+++ b/src/rpc/rpc_payment.cpp
@@ -366,7 +366,7 @@ namespace cryptonote
for (std::unordered_map<crypto::public_key, client_info>::iterator i = m_client_info.begin(); i != m_client_info.end(); )
{
std::unordered_map<crypto::public_key, client_info>::iterator j = i++;
- const time_t t = std::max(j->second.last_request_timestamp, j->second.update_time);
+ const time_t t = std::max(j->second.last_request_timestamp / 1000000, j->second.update_time);
const bool erase = t < ((j->second.credits == 0) ? threshold0 : threshold);
if (erase)
{