Merge pull request #9462 from brave/web-contents-send

check for destroyed before sending to webContents
brave · Jun 15, 2017 · a42dc39 · a42dc39
1 parent e0c1572
commit a42dc39
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -270,8 +270,11 @@ class AppStore extends EventEmitter {
     if (lastEmittedState) {
       const d = diff(lastEmittedState, appState)
       if (!d.isEmpty()) {
-        BrowserWindow.getAllWindows().forEach((wnd) =>
-          wnd.webContents.send(messages.APP_STATE_CHANGE, { stateDiff: d.toJS() }))
+        BrowserWindow.getAllWindows().forEach((wnd) => {
+          if (wnd.webContents && !wnd.webContents.isDestroyed()) {
+            wnd.webContents.send(messages.APP_STATE_CHANGE, { stateDiff: d.toJS() })
+          }
+        })
         lastEmittedState = appState
         this.emit(CHANGE_EVENT, d.toJS())
       }