len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix global proxy getting set too late.

Browse source 
Downloading the build information was done before setting the global proxy
values, so this broke in environments that completely block non-proxy
connections. Explicitly set the proxy on startup before downloading other
things. Remove some duplicated code. Fixes FS#11163.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26504 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-06-03 06:29:10 +00:00
parent 7e538995a5
commit 8be2a90d78
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -68,6 +68,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
absolutePath = qApp->applicationDirPath(); absolutePath = qApp->applicationDirPath();
HttpGet::setGlobalUserAgent("rbutil/"VERSION); HttpGet::setGlobalUserAgent("rbutil/"VERSION);
HttpGet::setGlobalProxy(proxy());
// init startup & autodetection // init startup & autodetection
ui.setupUi(this); ui.setupUi(this);
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
@ -319,15 +320,7 @@ void RbUtilQt::updateSettings()
qDebug() << "[RbUtil] updating current settings"; qDebug() << "[RbUtil] updating current settings";
updateDevice(); updateDevice();
updateManual(); updateManual();
if(RbSettings::value(RbSettings::ProxyType) == "system") { HttpGet::setGlobalProxy(proxy());
HttpGet::setGlobalProxy(System::systemProxy());
}
else if(RbSettings::value(RbSettings::ProxyType) == "manual") {
HttpGet::setGlobalProxy(RbSettings::value(RbSettings::Proxy).toString());
}
else {
HttpGet::setGlobalProxy(QUrl(""));
}
HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString()); HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString());
HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool()); HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool());