gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-23 07:29:11 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1573

Browse Source 
dea53962 fix timeout in check_connection (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-01-15 14:55:12 -05:00
parent 10c6afd316 dea53962a3
commit f00797a1f2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@@ -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;
}