Store addrProxy port in settings

This commit is contained in:
Pieter Wuille 2012-02-26 23:39:32 +01:00
parent 3f8cb2c565
commit 42c8b56f62

View file

@ -70,7 +70,7 @@ bool OptionsModel::Upgrade()
if (walletdb.ReadSetting("addrProxy", addrProxyAddress)) if (walletdb.ReadSetting("addrProxy", addrProxyAddress))
{ {
addrProxy = addrProxyAddress; addrProxy = addrProxyAddress;
settings.setValue("addrProxy", addrProxy.ToStringIP().c_str()); settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
walletdb.EraseSetting("addrProxy"); walletdb.EraseSetting("addrProxy");
} }
} }
@ -79,7 +79,7 @@ bool OptionsModel::Upgrade()
// 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress
if (walletdb.ReadSetting("addrProxy", addrProxy)) if (walletdb.ReadSetting("addrProxy", addrProxy))
{ {
settings.setValue("addrProxy", addrProxy.ToStringIP().c_str()); settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
walletdb.EraseSetting("addrProxy"); walletdb.EraseSetting("addrProxy");
} }
} }
@ -165,7 +165,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
if (addr.IsValid()) if (addr.IsValid())
{ {
addrProxy.SetIP(addr); addrProxy.SetIP(addr);
settings.setValue("addrProxy", addrProxy.ToStringIP().c_str()); settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
} }
else else
{ {
@ -179,7 +179,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max()) if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max())
{ {
addrProxy.SetPort(nPort); addrProxy.SetPort(nPort);
settings.setValue("addrProxy", addrProxy.ToStringIP().c_str()); settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
} }
else else
{ {