From 4cce9de9075474153a8299ab7430156bd6d194a9 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 25 Oct 2017 17:10:44 +0100
Subject: FF: Only apply fix to bug 1408996 when appropriate

---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 88ec134a..c0df315e 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -6,7 +6,7 @@ root = exports ? (window.root ?= {})
 # On Firefox, sometimes the variables assigned to window are lost (bug 1408996), so we reinstall them.
 # NOTE(mrmr1993): This bug leads to catastrophic failure (ie. nothing works and errors abound).
 DomUtils.documentReady ->
-  (extend ? root.extend) window, root
+  root.extend window, root unless extend?
 
 isEnabledForUrl = true
 isIncognitoMode = chrome.extension.inIncognitoContext
-- 
cgit v1.2.3