Permalink
Browse files

Merge pull request #1899 from Diapolo/proxy_optionsmodel

make optionsmodel query real proxy state for ::data()
  • Loading branch information...
2 parents 6644455 + 5e5c102 commit e74d0ab6752407d97c0586b1ba9bbaaad5e2e5f6 @sipa sipa committed Oct 25, 2012
Showing with 12 additions and 5 deletions.
  1. +12 −5 src/qt/optionsmodel.cpp
View
@@ -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;

0 comments on commit e74d0ab

Please sign in to comment.