From bc042d344d69c9378251ab98561dc29ee552279b Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 25 Sep 2014 11:25:49 +0100
Subject: Fail gracefully in restoreTab when runtime.lastError is set

This brings behaviour of the chrome.sessions codepath in line with the
legacy code.
---
 background_scripts/main.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 352cfa48..562be033 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -250,7 +250,8 @@ BackgroundCommands =
   restoreTab: (callback) ->
     # TODO: remove if-else -block when adopted into stable
     if chrome.sessions
-      chrome.sessions.restore(null, (restoredSession) -> callback())
+      chrome.sessions.restore(null, (restoredSession) ->
+          callback() unless chrome.runtime.lastError)
     else
       # TODO(ilya): Should this be getLastFocused instead?
       chrome.windows.getCurrent((window) ->
-- 
cgit v1.2.3