From c933a55b818052c0a0922257a9fb82928723850a Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 19 Feb 2019 22:50:33 -0500
Subject: Handle messages with unexpected response format

The response parameter can be undefined
---
 ext/fg/js/util.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'ext')

diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index 5eff4018..954b3988 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -26,11 +26,15 @@ function utilAsync(func) {
 function utilInvoke(action, params={}) {
     return new Promise((resolve, reject) => {
         try {
-            chrome.runtime.sendMessage({action, params}, ({result, error}) => {
-                if (error) {
-                    reject(error);
+            chrome.runtime.sendMessage({action, params}, (response) => {
+                if (response !== null && typeof response === 'object') {
+                    if (response.error) {
+                        reject(response.error);
+                    } else {
+                        resolve(response.result);
+                    }
                 } else {
-                    resolve(result);
+                    reject(`Unexpected response of type ${typeof response}`);
                 }
             });
         } catch (e) {
-- 
cgit v1.2.3