From 25c088907cc6adf8f0d0567f79fa87e7fa5163a5 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Tue, 19 Mar 2013 13:38:37 +0100
Subject: [PATCH] Fix server timeout setting parsing.

---
 core/res/xml/pref_server.xml                                | 1 -
 .../transdroid/core/app/settings/ApplicationSettings.java   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/res/xml/pref_server.xml b/core/res/xml/pref_server.xml
index c34556f7..c415267a 100644
--- a/core/res/xml/pref_server.xml
+++ b/core/res/xml/pref_server.xml
@@ -14,7 +14,6 @@
 	<EditTextPreference
 		android:key="server_address"
 		android:title="@string/pref_address"
-		android:summary="@string/pref_searchurl_info"
 		android:inputType="textUri" />
 	<EditTextPreference
 		android:key="server_port"
diff --git a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
index 9bd6d723..d7db7cac 100644
--- a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
+++ b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
@@ -68,9 +68,9 @@ public class ApplicationSettings {
 				prefs.getString("server_pass_" + order, null), prefs.getString("server_extrapass_" + order, null),
 				OS.fromCode(prefs.getString("server_os_" + order, null)), prefs.getString(
 						"server_downloaddir_" + order, null), prefs.getString("server_ftpurl_" + order, null),
-				prefs.getString("server_ftppass_" + order, null), prefs.getInt("server_timeout_" + order, 8),
-				prefs.getBoolean("server_alarmfinished_" + order, true), prefs.getBoolean("server_alarmnew_" + order,
-						false), false);
+				prefs.getString("server_ftppass_" + order, null), Integer.parseInt(prefs.getString("server_timeout_"
+						+ order, "8")), prefs.getBoolean("server_alarmfinished_" + order, true), prefs.getBoolean(
+						"server_alarmnew_" + order, false), false);
 	}
 
 	/**