diff options
author | Jaquee <jaquee.monero@gmail.com> | 2017-01-14 14:41:56 +0100 |
---|---|---|
committer | Jaquee <jaquee.monero@gmail.com> | 2017-01-14 14:45:30 +0100 |
commit | dea53962a356259e5b82f3d7abbdd54772d29c71 (patch) | |
tree | 1e39e58e4840cc74de75511bec3ef55c01d789b4 /src/wallet/wallet2.cpp | |
parent | Merge pull request #1562 (diff) | |
download | monero-dea53962a356259e5b82f3d7abbdd54772d29c71.tar.xz |
fix timeout in check_connection
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r-- | src/wallet/wallet2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 0ad74f52a..281c9c694 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2234,7 +2234,7 @@ bool wallet2::prepare_file_names(const std::string& file_path) return true; } //---------------------------------------------------------------------------------------------------- -bool wallet2::check_connection(uint32_t *version) +bool wallet2::check_connection(uint32_t *version, uint32_t timeout) { boost::lock_guard<boost::mutex> lock(m_daemon_rpc_mutex); @@ -2248,7 +2248,7 @@ bool wallet2::check_connection(uint32_t *version) u.port = m_testnet ? config::testnet::RPC_DEFAULT_PORT : config::RPC_DEFAULT_PORT; } - if (!m_http_client.connect(u.host, std::to_string(u.port), 10000)) + if (!m_http_client.connect(u.host, std::to_string(u.port), timeout)) return false; } |