diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 9795a0fa7c90..03c7304ae7c2 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -218,7 +218,7 @@ function UpdateBackForwardButtons() function UpdatePageReport(event) { if (!gReportButton) - return; + gReportButton = document.getElementById("page-report-button"); if (gBrowser.mCurrentBrowser.pageReport) { gReportButton.setAttribute("blocked", "true"); @@ -256,8 +256,7 @@ function Startup() // init globals gNavigatorBundle = document.getElementById("bundle_browser"); gBrowser = document.getElementById("content"); - gURLBar = document.getElementById("urlbar"); - gReportButton = document.getElementById("page-report-button"); + gURLBar = document.getElementById("urlbar"); gBrowser.addEventListener("DOMUpdatePageReport", UpdatePageReport, false); diff --git a/browser/components/downloads/src/nsDownloadManager.cpp b/browser/components/downloads/src/nsDownloadManager.cpp index 7f7f18fa101c..068091599d21 100644 --- a/browser/components/downloads/src/nsDownloadManager.cpp +++ b/browser/components/downloads/src/nsDownloadManager.cpp @@ -97,7 +97,7 @@ nsDownloadManager::nsDownloadManager() : mBatches(0) nsDownloadManager::~nsDownloadManager() { - if (--gRefCnt != 0 || !gRDFService) + if (--gRefCnt != 0 || !gRDFService || !gObserverService) // Either somebody tried to use |CreateInstance| instead of // |GetService| or |Init| failed very early, so there's nothing to // do here.