From f1cac34ea2ddbfd1e9745e5d59e31f0e5df3e483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 25 Jun 2010 12:33:19 +0000 Subject: [PATCH] proxy-detection was not always restarted in acceptValues, refs #5 --- configure.in | 2 +- proxyface/proxy.hxx | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index ce690d6..cfdfe23 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_INIT([README]) PACKAGENAME=proxyface MAJOR=1 -MINOR=1 +MINOR=2 LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" for path in . .. ../..; do if svn info $path 2>&1 > /dev/null; then diff --git a/proxyface/proxy.hxx b/proxyface/proxy.hxx index df14fe0..93b145c 100644 --- a/proxyface/proxy.hxx +++ b/proxyface/proxy.hxx @@ -53,17 +53,19 @@ namespace gui { void acceptValues() { QNetworkProxy::ProxyType type(QNetworkProxy::NoProxy); switch (_type->currentIndex()) { - case 0: try { + case 0: { _url->setEnabled(false); _port->setEnabled(false); - _auto.proxy(_testUrl); type=QNetworkProxy::NoProxy; - } catch (...) {} break; + } break; case 1: type=QNetworkProxy::HttpProxy; break; case 2: type=QNetworkProxy::Socks5Proxy; break; } QNetworkProxy::setApplicationProxy (QNetworkProxy(type, _url->text(), _port->value())); + try { + _auto.proxy(_testUrl); + } catch (...) {} } Q_SIGNALS: