diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-01-17 00:35:16 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-01-17 00:35:16 -0800 |
| commit | 43cda5f325f53e8941efa7f712aed66e3fde172a (patch) | |
| tree | e86b9b17d1ad1515ef4f386fabacb740494ac2f8 /src/qt/optionsmodel.cpp | |
| parent | Fix handling of default ports (diff) | |
| parent | Remove erroneous ":" in front of port in options dialog (introduced with netw... (diff) | |
| download | discoin-43cda5f325f53e8941efa7f712aed66e3fde172a.tar.xz discoin-43cda5f325f53e8941efa7f712aed66e3fde172a.zip | |
Merge pull request #762 from laanwj/qtprogressfix
Revert to global progress indication, also fix the build
Diffstat (limited to 'src/qt/optionsmodel.cpp')
| -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 3237845c2..edc1d61e9 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -40,7 +40,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const case ProxyIP: return QVariant(QString::fromStdString(addrProxy.ToStringIP())); case ProxyPort: - return QVariant(QString::fromStdString(addrProxy.ToStringPort())); + return QVariant(addrProxy.GetPort()); case Fee: return QVariant(nTransactionFee); case DisplayUnit: @@ -87,7 +87,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in case ProxyIP: { // Use CAddress to parse and check IP - CAddress addr(value.toString().toStdString() + ":1"); + CNetAddr addr(value.toString().toStdString()); if (addr.IsValid()) { addrProxy.SetIP(addr); |