Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Issue 9508 #9509

Merged
merged 2 commits into from
Jun 20, 2017
Merged

Issue 9508 #9509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a36189a
check for tab destoyed
bridiver Jun 16, 2017
c1effd9
check for null frame
bridiver Jun 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/browser/tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ const api = {
let tabId = tab.getId()

tab.on('did-start-navigation', (e, navigationHandle) => {
if (navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
if (!tab.isDestroyed() && navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
const controller = tab.controller()
if (!controller.isValid()) {
return
Expand All @@ -443,7 +443,7 @@ const api = {
})

tab.on('did-finish-navigation', (e, navigationHandle) => {
if (navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
if (!tab.isDestroyed() && navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
const controller = tab.controller()
if (!controller.isValid()) {
return
Expand Down
2 changes: 1 addition & 1 deletion js/state/frameStateUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ function getTotalBlocks (frame) {
function isPinned (state, frameKey) {
const frame = getFrameByKey(state, frameKey)

return !!frame.get('pinnedLocation')
return frame && !!frame.get('pinnedLocation')
}

/**
Expand Down