diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-06-26 20:20:43 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-06-26 20:20:43 +0200 |
commit | e240469e7241fece5c00b398007b6c529301de6d (patch) | |
tree | 5989292b034f08296b9f156b5700a653dc78557a /toolkit/content/aboutSupport.js | |
parent | 8207d755f1299032d9102182993d390a62dad7e0 (diff) | |
download | UXP-e240469e7241fece5c00b398007b6c529301de6d.tar UXP-e240469e7241fece5c00b398007b6c529301de6d.tar.gz UXP-e240469e7241fece5c00b398007b6c529301de6d.tar.lz UXP-e240469e7241fece5c00b398007b6c529301de6d.tar.xz UXP-e240469e7241fece5c00b398007b6c529301de6d.zip |
"about:support" - added support for "Restart normally"
https://github.com/MoonchildProductions/Pale-Moon/pull/1093 (partially)
Diffstat (limited to 'toolkit/content/aboutSupport.js')
-rw-r--r-- | toolkit/content/aboutSupport.js | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 016549f43..4e42a5687 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -879,16 +879,25 @@ function populateActionBox() { } } -// Prompt user to restart the browser in safe mode -function safeModeRestart() { +// Prompt user to restart the browser +function restart(safeMode) { let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] .createInstance(Ci.nsISupportsPRBool); Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart"); - if (!cancelQuit.data) { - Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit); + if (cancelQuit.data) { + return; + } + + let flags = Ci.nsIAppStartup.eAttemptQuit; + + if (safeMode) { + Services.startup.restartInSafeMode(flags); + } else { + Services.startup.quit(flags | Ci.nsIAppStartup.eRestart); } } + /** * Set up event listeners for buttons. */ @@ -915,9 +924,12 @@ function setupEventListeners() { if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) { Services.obs.notifyObservers(null, "restart-in-safe-mode", ""); } else { - safeModeRestart(); + restart(true); } }); + $("restart-button").addEventListener("click", function(event) { + restart(false); + }); $("verify-place-integrity-button").addEventListener("click", function(event) { PlacesDBUtils.checkAndFixDatabase(function(aLog) { let msg = aLog.join("\n"); |