Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbutil: fix segfault for mac and wrong proxy default.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16396 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-02-23 21:27:00 +00:00
parent d03514a8dc
commit a4de1b8ecb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/rbsettings.cpp
View file

@ -160,7 +160,7 @@ bool RbSettings::cacheDisabled()
QString RbSettings::proxyType()
{
return userSettings->value("proxytype", "system").toString();
return userSettings->value("proxytype", "none").toString();
}
QString RbSettings::proxy()

5
rbutil/rbutilqt/utils.cpp
View file

@ -57,8 +57,7 @@ QUrl systemProxy(void)
{
#if defined(Q_OS_LINUX)
return QUrl(getenv("http_proxy"));
#endif
#if defined(Q_OS_WIN32)
#elseif defined(Q_OS_WIN32)
HKEY hk;
wchar_t proxyval[80];
DWORD buflen = 80;
@ -84,5 +83,7 @@ QUrl systemProxy(void)
return QUrl("http://" + QString::fromWCharArray(proxyval));
else
return QUrl("");
#else
return QUrl("");
#endif
}