aboutsummaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-09-08 19:40:29 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-09-08 19:40:29 -0500
commitda4512639e800a335bb29697b2dc1004edfe7514 (patch)
tree8762a6af344957fdb16a5451db92e332ecf570fd /src/daemon
parentMerge pull request #5544 (diff)
parentdaemon: fix merge error removing the "never seen before" timestamp check (diff)
downloadmonero-da4512639e800a335bb29697b2dc1004edfe7514.tar.xz
Merge pull request #5830
5a4c6cc daemon: fix merge error removing the 'never seen before' timestamp check (moneromooo-monero)
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/rpc_command_executor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 4d3debed6..670affd76 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -66,7 +66,7 @@ namespace {
time(&now);
time_t last_seen = static_cast<time_t>(peer.last_seen);
- std::string elapsed = epee::misc_utils::get_time_interval_string(now - last_seen);
+ std::string elapsed = peer.last_seen == 0 ? "never" : epee::misc_utils::get_time_interval_string(now - last_seen);
std::string id_str = epee::string_tools::pad_string(epee::string_tools::to_string_hex(peer.id), 16, '0', true);
std::string port_str;
epee::string_tools::xtype_to_string(peer.port, port_str);