From 4e3792aba319b52f957c70347e859f677972e4e2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 5 Feb 2017 16:39:40 -0800
Subject: handle content script and background script desync on version update

---
 ext/fg/js/util.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'ext/fg/js/util.js')

diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index ef45d08c..ba872467 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -19,16 +19,25 @@
 
 function invokeBgApi(action, params) {
     return new Promise((resolve, reject) => {
-        chrome.runtime.sendMessage({action, params}, ({result, error}) => {
-            if (error) {
-                reject(error);
-            } else {
-                resolve(result);
-            }
-        });
+        try {
+            chrome.runtime.sendMessage({action, params}, ({result, error}) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    resolve(result);
+                }
+            });
+        } catch (e) {
+            window.orphaned = true;
+            reject(e.message);
+        }
     });
 }
 
+function showError(error) {
+    window.alert(`Error: ${error}`);
+}
+
 function isEnabled() {
     return invokeBgApi('getEnabled', {});
 }
-- 
cgit v1.2.3