From 77b102669e454b59f394e768b1752ff831719ee9 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 12 Dec 2017 12:38:01 -0800
Subject: [PATCH 1/2] try harder to keep setTimeout loop going in
 controller-dispatcher

---
 scripts/system/controllers/controllerDispatcher.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 57f3b4fd8b..af3b1d2ed6 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -154,6 +154,15 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         };
 
         this.update = function () {
+            try {
+                this.updateInternal();
+            }  catch (e) {
+                print(e);
+            }
+            Script.setTimeout(_this.update, BASIC_TIMER_INTERVAL_MS);
+        };
+
+        this.updateInternal = function () {
             if (PROFILE) {
                 Script.beginProfileRange("dispatch.pre");
             }
@@ -376,7 +385,6 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             if (PROFILE) {
                 Script.endProfileRange("dispatch.run");
             }
-            Script.setTimeout(_this.update, BASIC_TIMER_INTERVAL_MS);
         };
 
         this.setBlacklist = function() {

From 9863458fef38ca0243c6d7945e16ba7a1192d6c5 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 12 Dec 2017 12:59:35 -0800
Subject: [PATCH 2/2] oops

---
 scripts/system/controllers/controllerDispatcher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index af3b1d2ed6..915b3b3680 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -155,7 +155,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
 
         this.update = function () {
             try {
-                this.updateInternal();
+                _this.updateInternal();
             }  catch (e) {
                 print(e);
             }