From 61487cb652cd58f0d6fb6ffa98b0a5714d1c8a43 Mon Sep 17 00:00:00 2001
From: benji7425 <benji7425@outlook.com>
Date: Fri, 6 Jan 2017 22:09:16 +0000
Subject: [PATCH] Revert "Merged hotfix/reconnect-spam into develop"

This reverts commit b78a62a476886f756d9cddaa62a21a0da8c633f1.
Dedided not to do the whole 4-digit versioning thing
---
 CHANGELOG.md | 6 ------
 feed-bot.js  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27cec76..b242329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
 # Changelog
 
-## v1.1.2.1
-
-### Fixed
-
-- Fixed reconnect timer being set to 0 sometimes
-
 ## v1.1.2
 
 ### Updated
diff --git a/feed-bot.js b/feed-bot.js
index 2cec21b..66f8a3c 100644
--- a/feed-bot.js
+++ b/feed-bot.js
@@ -50,7 +50,7 @@ var DiscordClient = {
 
 		DiscordClient.reconnectInterval = setInterval(function () {
 			DiscordClient.startup();
-		}, Config.pollingInterval);
+		}, (Config.reconnectInterval || Config.pollingInterval));
 	},
 	onMessage: function (user, userID, channelID, message) {
 		//check if the message is in the right channel, contains a link, and is not the latest link from the rss feed