From 815d697efe6266bae51ec042c1d8611ef104944e Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Mon, 11 May 2020 15:40:17 -0700
Subject: [PATCH] fix(devtools): show not-angular popup for non-angular apps

---
 projects/shell-chrome/src/app/background.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/projects/shell-chrome/src/app/background.ts b/projects/shell-chrome/src/app/background.ts
index e500bbf6063..2ff506ebba1 100644
--- a/projects/shell-chrome/src/app/background.ts
+++ b/projects/shell-chrome/src/app/background.ts
@@ -100,16 +100,18 @@ const getPopUpName = (ng: AngularDetection) => {
 };
 
 chrome.runtime.onMessage.addListener((req, sender) => {
-  if (sender.tab && req.isAngular) {
+  if (sender && sender.tab) {
+    chrome.browserAction.setPopup({
+      tabId: sender.tab.id,
+      popup: `popups/${getPopUpName(req)}`,
+    });
+  }
+  if (sender && sender.tab && req.isAngular) {
     chrome.browserAction.setIcon({
       tabId: sender.tab.id,
       path: {
         16: `assets/favicon.ico`,
       },
     });
-    chrome.browserAction.setPopup({
-      tabId: sender.tab.id,
-      popup: `popups/${getPopUpName(req)}`,
-    });
   }
 });