diff options
| author | Dominik Wenger <domonoky@googlemail.com> | 2008-02-23 21:27:00 +0000 |
|---|---|---|
| committer | Dominik Wenger <domonoky@googlemail.com> | 2008-02-23 21:27:00 +0000 |
| commit | a4de1b8ecbdbf8474109aac55ef52edb0259b8ab (patch) | |
| tree | 42e3473481d97a0204048f157538c6248bb2f486 | |
| parent | d03514a8dcfa73c169dd72a98f95bd668f9fe7a4 (diff) | |
| download | rockbox-a4de1b8ecbdbf8474109aac55ef52edb0259b8ab.zip rockbox-a4de1b8ecbdbf8474109aac55ef52edb0259b8ab.tar.gz rockbox-a4de1b8ecbdbf8474109aac55ef52edb0259b8ab.tar.bz2 rockbox-a4de1b8ecbdbf8474109aac55ef52edb0259b8ab.tar.xz | |
rbutil: fix segfault for mac and wrong proxy default.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16396 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/utils.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 8b2569c..7f4864f 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp @@ -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() diff --git a/rbutil/rbutilqt/utils.cpp b/rbutil/rbutilqt/utils.cpp index 5292985..27314a8 100644 --- a/rbutil/rbutilqt/utils.cpp +++ b/rbutil/rbutilqt/utils.cpp @@ -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 } |