From a4de1b8ecbdbf8474109aac55ef52edb0259b8ab Mon Sep 17 00:00:00 2001
From: Dominik Wenger <domonoky@googlemail.com>
Date: Sat, 23 Feb 2008 21:27:00 +0000
Subject: [PATCH] rbutil: fix segfault for mac and wrong proxy default.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16396 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbsettings.cpp | 2 +-
 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 8b2569c365..7f4864f515 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 529298530e..27314a8ef2 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
 }