// These are shared with core Bitcoin; we want
// command-line options to override the GUI settings:
- if (settings.contains("fUseUPnP"))
- SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool());
if ( !(settings.value("fTorOnly").toBool() && settings.contains("addrTor")) ) {
if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool())
SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString());
return QVariant(GUIUtil::GetStartOnSystemStartup());
case MinimizeToTray:
return QVariant(fMinimizeToTray);
- case MapPortUPnP:
- return settings.value("fUseUPnP", GetBoolArg("-upnp", true));
case MinimizeOnClose:
return QVariant(fMinimizeOnClose);
case ProxyUse:
if (GetProxy(NET_IPV4, proxy))
return QVariant(proxy.first.GetPort());
else
- return QVariant(9050);
+ return QVariant(nSocksDefault);
}
case ProxySocksVersion:
return settings.value("nSocksVersion", 5);
if (GetProxy(NET_TOR, proxy))
return QVariant(proxy.first.GetPort());
else
- return QVariant(9050);
+ return QVariant(nSocksDefault);
}
case TorOnly:
return settings.value("fTorOnly", false);
fMinimizeToTray = value.toBool();
settings.setValue("fMinimizeToTray", fMinimizeToTray);
break;
- case MapPortUPnP:
- fUseUPnP = value.toBool();
- settings.setValue("fUseUPnP", fUseUPnP);
- MapPort();
- break;
case MinimizeOnClose:
fMinimizeOnClose = value.toBool();
settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
break;
case ProxyIP: {
proxyType proxy;
- proxy.first = CService("127.0.0.1", 9050);
+ proxy.first = CService("127.0.0.1", nSocksDefault);
GetProxy(NET_IPV4, proxy);
CNetAddr addr(value.toString().toStdString());
break;
case ProxyPort: {
proxyType proxy;
- proxy.first = CService("127.0.0.1", 9050);
+ proxy.first = CService("127.0.0.1", nSocksDefault);
GetProxy(NET_IPV4, proxy);
proxy.first.SetPort(value.toInt());
break;
case TorIP: {
proxyType proxy;
- proxy.first = CService("127.0.0.1", 9050);
- GetProxy(NET_IPV4, proxy);
+ proxy.first = CService("127.0.0.1", nSocksDefault);
+ GetProxy(NET_TOR, proxy);
CNetAddr addr(value.toString().toStdString());
proxy.first.SetIP(addr);
break;
case TorPort: {
proxyType proxy;
- proxy.first = CService("127.0.0.1", 9050);
- GetProxy(NET_IPV4, proxy);
+ proxy.first = CService("127.0.0.1", nSocksDefault);
+ GetProxy(NET_TOR, proxy);
- proxy.first.SetPort(value.toInt());
+ proxy.first.SetPort((uint16_t)value.toUInt());
settings.setValue("addrTor", proxy.first.ToStringIPPort().c_str());
successful = ApplyTorSettings();
}