diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-20 16:35:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-20 16:37:38 +0200 |
| commit | b6ea3bcede1cbbf89486b9d67329e0110c4624ae (patch) | |
| tree | fabff7884ea479e390b893e5aa2bbe9fbbde87c9 /src/qt | |
| parent | 71900b4426adc96322c432a42b952c685f8b3b7f (diff) | |
| parent | 6be3562e507d6a3e4c318f79c89e1def073b430c (diff) | |
| download | bitcoin-b6ea3bcede1cbbf89486b9d67329e0110c4624ae.tar.xz | |
Merge pull request #5911
6be3562 rpc-tests: Add proxy test (Wladimir J. van der Laan)
67a7949 privacy: Stream isolation for Tor (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/optionsmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index a169ed6b55..41d6acf358 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -335,8 +335,8 @@ bool OptionsModel::getProxySettings(QNetworkProxy& proxy) const proxyType curProxy; if (GetProxy(NET_IPV4, curProxy)) { proxy.setType(QNetworkProxy::Socks5Proxy); - proxy.setHostName(QString::fromStdString(curProxy.ToStringIP())); - proxy.setPort(curProxy.GetPort()); + proxy.setHostName(QString::fromStdString(curProxy.proxy.ToStringIP())); + proxy.setPort(curProxy.proxy.GetPort()); return true; } |