aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/rpc_command_executor.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-08-20 12:48:55 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-08-20 12:48:55 +0000
commit5a4c6cc3a89cf613e6770857b4180359d79cc8b2 (patch)
tree1c7bc5eb2cffd1670b44c3a0a4fea1a76e51d41e /src/daemon/rpc_command_executor.cpp
parentMerge pull request #5696 (diff)
downloadmonero-5a4c6cc3a89cf613e6770857b4180359d79cc8b2.tar.xz
daemon: fix merge error removing the "never seen before" timestamp check
Diffstat (limited to '')
-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);