Merge remote-tracking branch 'upstream/master' into vichan-merge

1 files changed, 3 insertions, 5 deletions

diff --git a/js/settings.js b/js/settings.js
index 02d5658d..81e88f7a 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -55,13 +55,11 @@ tb_settings['wpaint'] = {
 // auto-reload.js
 tb_settings['auto-reload'] = {
 	// Minimum delay before reloading the page when at the bottom
-	min_delay_bottom: 3000,
-	// Minimum delay before reloading the page when not at the bottom
-	min_delay_top: 10000,
+	min_delay_bottom: 5000,
 	// Maximum delay before reloading the page
 	max_delay: 600000,
-	//Delay to wait before reloading when the user scrolls to the bottom
-	quick_delay: 100,
+	// Delay if there was an error
+	error_delay: 30000,
 	// Reset the delay to the minimum upon focussing the window.
 	reset_focus: true
 };