aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qt/optionsmodel.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1b2f18eab3..1075ce1e6c 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -142,8 +142,10 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
case MinimizeOnClose:
return QVariant(fMinimizeOnClose);
- case ProxyUse:
- return settings.value("fUseProxy", false);
+ case ProxyUse: {
+ proxyType proxy;
+ return QVariant(GetProxy(NET_IPV4, proxy));
+ }
case ProxyIP: {
proxyType proxy;
if (GetProxy(NET_IPV4, proxy))
@@ -158,8 +160,13 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
else
return QVariant(9050);
}
- case ProxySocksVersion:
- return settings.value("nSocksVersion", 5);
+ case ProxySocksVersion: {
+ proxyType proxy;
+ if (GetProxy(NET_IPV4, proxy))
+ return QVariant(proxy.second);
+ else
+ return QVariant(5);
+ }
case Fee:
return QVariant(nTransactionFee);
case DisplayUnit:
@@ -203,7 +210,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
break;
case ProxyUse:
settings.setValue("fUseProxy", value.toBool());
- ApplyProxySettings();
+ successful = ApplyProxySettings();
break;
case ProxyIP: {
proxyType proxy;