aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmisc.cpp
diff options
context:
space:
mode:
authorlangerhans <[email protected]>2015-07-02 19:54:14 +0200
committerlangerhans <[email protected]>2015-07-02 19:54:14 +0200
commit66eb58e86c04432d0ef218e0df9d6b28e0ea5904 (patch)
treef96a918113239134511c06153cd87b50f1c23776 /src/rpcmisc.cpp
parentMerge branch '1.8.2-dev' into 1.8-maint (diff)
parentMerge pull request #1191 from langerhans/1.8.3-releaseprep (diff)
downloaddiscoin-66eb58e86c04432d0ef218e0df9d6b28e0ea5904.tar.xz
discoin-66eb58e86c04432d0ef218e0df9d6b28e0ea5904.zip
Merge branch '1.8.3-dev' into 1.8-maint
Diffstat (limited to 'src/rpcmisc.cpp')
-rw-r--r--src/rpcmisc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 267516c82..508c17cd0 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -71,7 +71,7 @@ Value getinfo(const Array& params, bool fHelp)
obj.push_back(Pair("blocks", (int)chainActive.Height()));
obj.push_back(Pair("timeoffset", GetTimeOffset()));
obj.push_back(Pair("connections", (int)vNodes.size()));
- obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string())));
+ obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.ToStringIPPort() : string())));
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
obj.push_back(Pair("testnet", TestNet()));
#ifdef ENABLE_WALLET