From 17a24b4b3df24c5b3a354dd195e2f4fe3e4bfb54 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 5 Apr 2016 06:41:56 +0100
Subject: Unregister frame on "unload".

It seems we cannot rely on the port being disconnected to unregister a
frame.  So we need to unregister it on "unload".
---
 content_scripts/link_hints.coffee      | 2 +-
 content_scripts/vimium_frontend.coffee | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'content_scripts')

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index cef4b480..e650463f 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -72,7 +72,7 @@ HintCoordinator =
     # FIXME(smblott) Global link hints is currently insufficiently reliable.  If the mode above is left in
     # place, then Vimium blocks.  As a temporary measure, we install a timer to remove it.
     unless @debug
-      Utils.setTimeout 1000, => @suppressKeyboardEvents.exit() if @suppressKeyboardEvents.modeIsActive
+      Utils.setTimeout 1000, => @suppressKeyboardEvents.exit() if @suppressKeyboardEvents?.modeIsActive
     @onExit = [onExit]
     @sendMessage "prepareToActivateMode", modeIndex: availableModes.indexOf mode
 
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b73bd2e3..d9fc363e 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -244,6 +244,8 @@ Frame =
       isEnabledForUrl = false
       window.removeEventListener "focus", onFocus
 
+    window.addEventListener "unload", => @postMessage "unregsterFrame"
+
 setScrollPosition = ({ scrollX, scrollY }) ->
   if DomUtils.isTopFrame()
     DomUtils.documentReady ->
-- 
cgit v1.2.3