summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-09 23:33:53 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-09 23:33:53 +0000
commitc7052c341c71f90013676b2b4227b73ef9549264 (patch)
tree5f02a521097387a8bced851ff4d807da1bcb90d4
parent191b7e8380dc324ced5ad75174b7aa99206f8f8d (diff)
downloadrockbox-c7052c341c71f90013676b2b4227b73ef9549264.zip
rockbox-c7052c341c71f90013676b2b4227b73ef9549264.tar.gz
rockbox-c7052c341c71f90013676b2b4227b73ef9549264.tar.bz2
rockbox-c7052c341c71f90013676b2b4227b73ef9549264.tar.xz
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
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index c3f088f..041fafd 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());
}