aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-08-04 16:37:49 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-08-04 16:41:39 -0400
commit8945384bca00f74ba85c98a52925c254c49025a5 (patch)
treec5479d77e5feb28ed75b53715073bcf3b46c1ffe /src/qt
parent21ba407a7369a0229b8a8554dee0da63a64e6639 (diff)
net: Have LookupNumeric return a CService directly
Also fix up a few small issues: - Lookup with "badip:port" now sets the port to 0 - Don't allow assert to have side-effects
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/optionsdialog.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index e419e4d9ee..f73bb87064 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -327,8 +327,7 @@ QValidator::State ProxyAddressValidator::validate(QString &input, int &pos) cons
{
Q_UNUSED(pos);
// Validate the proxy
- CService serv;
- LookupNumeric(input.toStdString().c_str(), serv, 9050);
+ CService serv(LookupNumeric(input.toStdString().c_str(), 9050));
proxyType addrProxy = proxyType(serv, true);
if (addrProxy.IsValid())
return QValidator::Acceptable;