From c3054640a8f771c71e8806e69bc255f92e7c6eec Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Wed, 24 Apr 2019 03:12:48 -0700
Subject: [PATCH] Handle errors thrown by GM.xmlHttpRequest.

---
 src/platform/CrossOrigin.coffee | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/platform/CrossOrigin.coffee b/src/platform/CrossOrigin.coffee
index ad2c94dba..17e4dd2ca 100644
--- a/src/platform/CrossOrigin.coffee
+++ b/src/platform/CrossOrigin.coffee
@@ -19,7 +19,7 @@ CrossOrigin =
       cb response, responseHeaderString
     <% } %>
     <% if (type === 'userscript') { %>
-    (GM?.xmlHttpRequest or GM_xmlhttpRequest)
+    gmOptions =
       method: "GET"
       url: url
       headers: headers
@@ -40,6 +40,10 @@ CrossOrigin =
         cb null
       onabort: ->
         cb null
+    try
+      (GM?.xmlHttpRequest or GM_xmlhttpRequest) gmOptions
+    catch
+      $.queueTask cb, null
     <% } %>
 
   file: (url, cb) ->
@@ -102,7 +106,7 @@ CrossOrigin =
     req.onloadend = onloadend
 
     <% if (type === 'userscript') { %>
-    gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest) {
+    gmOptions = {
       method: 'GET'
       url
       headers
@@ -121,6 +125,11 @@ CrossOrigin =
       onabort:   -> req.onloadend()
       ontimeout: -> req.onloadend()
     }
+    try
+      gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest) gmOptions
+    catch
+      return $.ajax url, options
+
     if gmReq and typeof gmReq.abort is 'function'
       req.abort = ->
         try