Bug 1338893 - Don't use the window on application-foreground if it doesn't yet exist. r=sebastian

During a cold startup, depending how this exactly plays out we might receive an application-foreground notification before the browser window is ready. Since the code to restore the selected tab if it has been left zombified while in background is only relevant if Gecko was already running and backgrounded, we can simply add a null check for the window before accessing it.

MozReview-Commit-ID: Ahp5NAODKRF

--HG--
extra : rebase_source : bede266e13f48fbc2f7efd40bb9277be6d2bd3bf
This commit is contained in:
Jan Henning 2017-02-12 15:09:32 +01:00
Родитель d0f62ee58a
Коммит 55ecb8b313
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -356,8 +356,10 @@ SessionStore.prototype = {
// If we skipped restoring a zombified tab before backgrounding,
// we might have to do it now instead.
let window = Services.wm.getMostRecentWindow("navigator:browser");
let tab = window.BrowserApp.selectedTab;
this.restoreZombieTab(tab);
if (window) { // Might not yet be ready during a cold startup.
let tab = window.BrowserApp.selectedTab;
this.restoreZombieTab(tab);
}
break;
case "ClosedTabs:StartNotifications":
this._notifyClosedTabs = true;