From c7052c341c71f90013676b2b4227b73ef9549264 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 9 Mar 2008 23:33:53 +0000 Subject: When unsetting the proxy in the settings dialog unset the global proxy too. Update settings in prior to re-downloading the info files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16596 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index c3f088f0a6..041fafdd60 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -241,8 +241,8 @@ void RbUtilQt::configDialog() Config *cw = new Config(this); cw->setSettings(settings); cw->show(); - connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); + connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); } @@ -257,6 +257,9 @@ void RbUtilQt::updateSettings() else if(settings->proxyType() == "manual") { HttpGet::setGlobalProxy(settings->proxy()); } + else { + HttpGet::setGlobalProxy(QUrl("")); + } HttpGet::setGlobalCache(settings->cachePath()); } -- cgit v1.2.3