diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-03-09 23:33:53 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-03-09 23:33:53 +0000 |
commit | c7052c341c71f90013676b2b4227b73ef9549264 (patch) | |
tree | 5f02a521097387a8bced851ff4d807da1bcb90d4 | |
parent | 191b7e8380dc324ced5ad75174b7aa99206f8f8d (diff) | |
download | rockbox-c7052c341c71f90013676b2b4227b73ef9549264.tar.gz rockbox-c7052c341c71f90013676b2b4227b73ef9549264.zip |
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.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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() | |||
241 | Config *cw = new Config(this); | 241 | Config *cw = new Config(this); |
242 | cw->setSettings(settings); | 242 | cw->setSettings(settings); |
243 | cw->show(); | 243 | cw->show(); |
244 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); | ||
245 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 244 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
245 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); | ||
246 | } | 246 | } |
247 | 247 | ||
248 | 248 | ||
@@ -257,6 +257,9 @@ void RbUtilQt::updateSettings() | |||
257 | else if(settings->proxyType() == "manual") { | 257 | else if(settings->proxyType() == "manual") { |
258 | HttpGet::setGlobalProxy(settings->proxy()); | 258 | HttpGet::setGlobalProxy(settings->proxy()); |
259 | } | 259 | } |
260 | else { | ||
261 | HttpGet::setGlobalProxy(QUrl("")); | ||
262 | } | ||
260 | HttpGet::setGlobalCache(settings->cachePath()); | 263 | HttpGet::setGlobalCache(settings->cachePath()); |
261 | } | 264 | } |
262 | 265 | ||