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

Commit

Permalink
Restore guard to populateHistory, fixes #8767
Browse files Browse the repository at this point in the history
Auditors:
@ayumi
@bsclifton
  • Loading branch information
evq committed May 8, 2017
1 parent 8afac1a commit baa0be0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions app/browser/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const needsPartitionAssigned = (createProperties) => {
// TODO(bridiver) - refactor this into an action
ipcMain.on(messages.ABOUT_COMPONENT_INITIALIZED, (e) => {
const tab = e.sender
const listener = () => {
const listener = (_diffs) => {
if (!tab.isDestroyed()) {
const tabValue = tabState.getByTabId(appStore.getState(), tab.getId())
if (tabValue && tabValue.get('active') === true) {
Expand Down Expand Up @@ -167,7 +167,9 @@ const updateAboutDetails = (tab, tabValue) => {
bookmarkFolders: bookmarkFolders.toJS()
})
} else if (location === 'about:history' && history) {
appActions.populateHistory()
if (!history) {
appActions.populateHistory()
}
tab.send(messages.HISTORY_UPDATED, history.toJS())
tab.send(messages.SETTINGS_UPDATED, appSettings.toJS())
} else if (location === 'about:extensions' && extensions) {
Expand Down

1 comment on commit baa0be0

@bsclifton
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Please sign in to comment.