Merge pull request #1776

e4dbea97 wallet2: fix wrong status on daemon shutdown/startup (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-02-24 14:22:55 +02:00
commit 1e7f783f69
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -2298,7 +2298,11 @@ bool wallet2::check_connection(uint32_t *version, uint32_t timeout)
req_t.id = epee::serialization::storage_entry(0); req_t.id = epee::serialization::storage_entry(0);
req_t.method = "get_version"; req_t.method = "get_version";
bool r = net_utils::invoke_http_json("/json_rpc", req_t, resp_t, m_http_client); bool r = net_utils::invoke_http_json("/json_rpc", req_t, resp_t, m_http_client);
if (!r || resp_t.result.status != CORE_RPC_STATUS_OK) if(!r) {
*version = 0;
return false;
}
if (resp_t.result.status != CORE_RPC_STATUS_OK)
*version = 0; *version = 0;
else else
*version = resp_t.result.version; *version = resp_t.result.version;