aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-02-23 11:47:30 +0100
committerJaquee <jaquee.monero@gmail.com>2017-02-23 12:41:21 +0100
commite4dbea976ed5275845fcd25aeaa0815d00ef9d4a (patch)
tree1ac3a9e0a07f0ec6fdd5784589148c6882b060cf
parentMerge pull request #1775 (diff)
downloadmonero-e4dbea976ed5275845fcd25aeaa0815d00ef9d4a.tar.xz
wallet2: fix wrong status on daemon shutdown/startup
-rw-r--r--src/wallet/wallet2.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 385f73ade..24403f6ae 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -2298,7 +2298,11 @@ bool wallet2::check_connection(uint32_t *version, uint32_t timeout)
req_t.id = epee::serialization::storage_entry(0);
req_t.method = "get_version";
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;
else
*version = resp_t.result.version;