From 12ac663034ab3782c882b0af7324075fbac1371b Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Sun, 8 May 2016 11:48:03 +0200
Subject: [PATCH] Don't break the Developer Toolbar when pressing `<escape>`

Fixes #723.
---
 extension/lib/commands.coffee | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee
index 55e6fd2..b4885f4 100644
--- a/extension/lib/commands.coffee
+++ b/extension/lib/commands.coffee
@@ -757,10 +757,15 @@ commands.dev = ({vim}) ->
 commands.esc = ({vim}) ->
   vim._run('esc')
   utils.blurActiveBrowserElement(vim)
-  vim.window.DeveloperToolbar.hide()
   vim.window.gBrowser.getFindBar().close()
   hints.removeHints(vim.window) # Better safe than sorry.
 
+  # Calling `.hide()` when the toolbar is not open can destroy it for the rest
+  # of the Firefox session. The code here is taken from the `.toggle()` method.
+  {DeveloperToolbar} = vim.window
+  if DeveloperToolbar.visible
+    DeveloperToolbar.hide().catch(console.error)
+
   unless help.getSearchInput(vim.window)?.getAttribute('focused')
     help.removeHelp(vim.window)
 
-- 
2.39.3