From 1d6b8f6c4035f6a350afbdc67b710cf060a95fda Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Kokem=C3=BCller?= <jan.kokemueller@gmail.com>
Date: Sat, 31 Mar 2018 14:23:09 +0000
Subject: [PATCH] Work around changes introduced in upstream bug 888600 (#912)

---
 extension/lib/message-manager.coffee | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension/lib/message-manager.coffee b/extension/lib/message-manager.coffee
index bc2a896..d23450e 100644
--- a/extension/lib/message-manager.coffee
+++ b/extension/lib/message-manager.coffee
@@ -9,8 +9,11 @@ defaultMessageManager =
   if IS_FRAME_SCRIPT
     FRAME_SCRIPT_ENVIRONMENT
   else
-    Cc['@mozilla.org/globalmessagemanager;1']
-      .getService(Ci.nsIMessageListenerManager)
+    try
+      Cc['@mozilla.org/globalmessagemanager;1']
+        .getService(Ci.nsIMessageListenerManager)
+    catch
+      Cc['@mozilla.org/globalmessagemanager;1'].getService()
 
 defaultOptions = {
   messageManager: defaultMessageManager
-- 
2.39.3