From 14a7f55e1a8367bc3ef16a1e70dc59ea8b761ce6 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sun, 24 Mar 2019 02:56:24 -0700
Subject: [PATCH] Handle aborts in Thread Updater similarly.

---
 src/Monitoring/ThreadUpdater.coffee | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index c3151569c..bfaac34e5 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -128,10 +128,10 @@ ThreadUpdater =
       $.cb.value.call @ if e
 
     load: ->
-      {req} = ThreadUpdater
-      switch req.status
+      return if @ isnt ThreadUpdater.req # aborted
+      switch @status
         when 200
-          ThreadUpdater.parse req
+          ThreadUpdater.parse @
           if ThreadUpdater.thread.isArchived
             ThreadUpdater.kill()
           else
@@ -151,9 +151,9 @@ ThreadUpdater =
             if confirmed
               ThreadUpdater.kill()
             else
-              ThreadUpdater.error req
+              ThreadUpdater.error @
         else
-          ThreadUpdater.error req
+          ThreadUpdater.error @
 
   kill: ->
     ThreadUpdater.thread.kill()
@@ -230,7 +230,9 @@ ThreadUpdater =
   update: ->
     clearTimeout ThreadUpdater.timeoutID
     ThreadUpdater.set 'timer', '...', 'loading'
-    ThreadUpdater.req?.abort()
+    if (oldReq = ThreadUpdater.req)
+      delete ThreadUpdater.req
+      oldReq.abort()
     ThreadUpdater.req = $.whenModified(
       Site.urls.threadJSON({boardID: ThreadUpdater.thread.board.ID, threadID: ThreadUpdater.thread.ID}),
       'ThreadUpdater',