Merge pull request #10124 from brave/10122

Check tags before using them
brave · Jul 31, 2017 · 102d65d · 102d65d
1 parent f82239a
commit 102d65d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/browser/windows.js b/app/browser/windows.js
@@ -69,8 +69,14 @@ const updatePinnedTabs = (win) => {
   const appStore = require('../../js/stores/appStore')
   const state = appStore.getState()
   const windowId = win.id
-  const pinnedSites = state.get('sites').toList().filter((site) =>
-    site.get('tags').includes(siteTags.PINNED)).map(site => getPinnedSiteProps(site))
+  const pinnedSites = state.get('sites').toList().filter((site) => {
+    const tags = site.get('tags')
+    if (!tags) {
+      return false
+    }
+    return tags.includes(siteTags.PINNED)
+  })
+      .map(site => getPinnedSiteProps(site))
   const pinnedTabs = getPinnedTabsByWindowId(state, windowId)
 
   pinnedSites.filter((site) =>