Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug 399460: if browser crashes or is killed (like with the Ts test) before we write out prefs, you can get two Places folders on the toolbar. r=mano, a=mconnor for M9

Browse Source
This commit is contained in:
sspitzer@mozilla.org 2007-10-12 19:43:48 -07:00
parent e0f4feb1cf
commit 6ee3eb160f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/base/content/browser.js
View File

@ -320,9 +320,7 @@ function initBookmarksToolbar() {
function initPlacesDefaultQueries() {
var createdDefaultQueries = false;
try {
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
createdDefaultQueries = prefBranch.getBoolPref("browser.places.createdDefaultQueries");
createdDefaultQueries = gPrefService.getBoolPref("browser.places.createdDefaultQueries");
} catch(ex) {}
if (createdDefaultQueries)
@ -418,10 +416,12 @@ function initPlacesDefaultQueries() {
}
try {
bmsvc.runInBatchMode(callback, null)
}
finally {
prefBranch.setBoolPref("browser.places.createdDefaultQueries", true);
bmsvc.runInBatchMode(callback, null);
} finally {
// We need to persist this preference change, since we want to
// check it at next app start even if the browser exits abruptly
gPrefService.setBoolPref("browser.places.createdDefaultQueries", true);
gPrefService.savePrefFile(null);
}
}