diff options
Diffstat (limited to 'devtools/server/actors/targets')
-rw-r--r-- | devtools/server/actors/targets/window-global.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/devtools/server/actors/targets/window-global.js b/devtools/server/actors/targets/window-global.js index f8f5e5f3c6..3de93af513 100644 --- a/devtools/server/actors/targets/window-global.js +++ b/devtools/server/actors/targets/window-global.js @@ -521,9 +521,15 @@ class WindowGlobalTargetActor extends BaseTargetActor { * @return {Array} */ get windows() { - return this.docShells.map(docShell => { - return docShell.domWindow; - }); + const windows = []; + for (const docShell of this.docShells) { + try { + windows.push(docShell.domWindow); + } catch (e) { + // Ignore destroying docshells which may throw when accessing domWindow property. + } + } + return windows; } /** |