From f44ca0ff0b7f17a280e30348fdb68daa606b1b9f Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 31 May 2015 14:01:00 +0100
Subject: Fix options page error.

"setIcon" should be in the list of messages delivered to the options
page (and for which there is no handler).
---
 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 c8c83029..ea1f5930 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -220,7 +220,7 @@ initializePreDomReady = ->
     # from the former.
     return if sender.tab and not sender.tab.url.startsWith 'chrome-extension://'
     # These requests are delivered to the options page, but there are no handlers there.
-    return if request.handler in [ "registerFrame", "frameFocused", "unregisterFrame" ]
+    return if request.handler in [ "registerFrame", "frameFocused", "unregisterFrame", "setIcon" ]
     shouldHandleRequest = isEnabledForUrl
     # We always handle the message if it's one of these listed message types.
     shouldHandleRequest ||= request.name in [ "executePageCommand", "checkEnabledAfterURLChange" ]
-- 
cgit v1.2.3