Bug 900925 - don't report error except when it isn't expected. r=mconnor

This commit is contained in:
Robert Strong 2013-11-20 16:22:44 -08:00
Родитель 6ebf6121a6
Коммит ba83136bd7
1 изменённых файлов: 12 добавлений и 7 удалений

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

@ -21,17 +21,22 @@ function init(aEvent)
distroIdField.value = distroId + " - " + distroVersion; distroIdField.value = distroId + " - " + distroVersion;
distroIdField.style.display = "block"; distroIdField.style.display = "block";
// This must be set last because it might not exist due to bug 895473. try {
var distroAbout = Services.prefs.getComplexValue("distribution.about", // This is in its own try catch due to bug 895473 and bug 900925.
Components.interfaces.nsISupportsString); var distroAbout = Services.prefs.getComplexValue("distribution.about",
var distroField = document.getElementById("distribution"); Components.interfaces.nsISupportsString);
distroField.value = distroAbout; var distroField = document.getElementById("distribution");
distroField.style.display = "block"; distroField.value = distroAbout;
distroField.style.display = "block";
}
catch (ex) {
// Pref is unset
Components.utils.reportError(ex);
}
} }
} }
catch (e) { catch (e) {
// Pref is unset // Pref is unset
Components.utils.reportError(e);
} }
// Include the build ID and display warning if this is an "a#" (nightly or aurora) build // Include the build ID and display warning if this is an "a#" (nightly or aurora) build