aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-14 21:33:01 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-14 21:33:02 +0200
commit59e8a4c30687990c1d658bede10d698ed57005d7 (patch)
tree22cd20a59f03f193c77e48f06dd7c9495e50c272 /contrib
parentMerge pull request #4751 (diff)
parenthardfork: initialize current_fork_index in ctor (diff)
downloadmonero-59e8a4c30687990c1d658bede10d698ed57005d7.tar.xz
Merge pull request #4753
157054b8 hardfork: initialize current_fork_index in ctor (moneromooo-monero) 2362baf7 network_throttle: initialize m_last_sample_time in ctor (moneromooo-monero) d9400f69 serializtion: add missing mainnet and stagenet fields for 0mq (moneromooo-monero) cbe0122b wallet2: initialize amount to 0 in tx_scan_info_t ctor (moneromooo-monero)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/src/network_throttle-detail.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/epee/src/network_throttle-detail.cpp b/contrib/epee/src/network_throttle-detail.cpp
index 28c85bb78..6f727a1cf 100644
--- a/contrib/epee/src/network_throttle-detail.cpp
+++ b/contrib/epee/src/network_throttle-detail.cpp
@@ -150,6 +150,7 @@ network_throttle::network_throttle(const std::string &nameshort, const std::stri
m_any_packet_yet = false;
m_slot_size = 1.0; // hard coded in few places
m_target_speed = 16 * 1024; // other defaults are probably defined in the command-line parsing code when this class is used e.g. as main global throttle
+ m_last_sample_time = 0;
}
void network_throttle::set_name(const std::string &name)