Merge branch 'master' into winbuffers

2014-07-29 15:52:14 +01:00
parent 73a56de470 816351d371
commit d8cab42a2a
1 changed files with 5 additions and 1 deletions
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -252,7 +252,11 @@ prefs_get_priority(void)
 gint
 prefs_get_reconnect(void)
 {
-    return g_key_file_get_integer(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL);
+    if (!g_key_file_has_key(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL)) {
+        return 30;
+    } else {
+        return g_key_file_get_integer(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL);
+    }
 }

 void