From deb4118c5d24acc99db0ef55d9fe724413192a19 Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Mon, 28 Jan 2019 14:00:22 -0800
Subject: [PATCH] Fix long-polling mixup

Fixes #110.
---
 CHANGELOG.md              | 1 +
 plugin/src/ApiContext.lua | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b15b44eb..6df231e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 * Fixed in-memory filesystem not handling out-of-order filesystem change events
+* Fixed long-polling error caused by a promise mixup ([#110](https://github.com/LPGhatguy/rojo/issues/110))
 
 ## [0.5.0 Alpha 1](https://github.com/LPGhatguy/rojo/releases/tag/v0.5.0-alpha.1) (January 14, 2019)
 * Changed plugin UI to be way prettier
diff --git a/plugin/src/ApiContext.lua b/plugin/src/ApiContext.lua
index f8fd2fe6..540a978e 100644
--- a/plugin/src/ApiContext.lua
+++ b/plugin/src/ApiContext.lua
@@ -143,7 +143,7 @@ function ApiContext:retrieveMessages()
 	return Http.get(url)
 		:catch(function(err)
 			if err.type == HttpError.Error.Timeout then
-				return self:retrieveMessages()
+				return Http.get(url)
 			end
 
 			return Promise.reject(err)