Unverified Commit 923fd850 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 28039: Enable dump() if log method is 0

Without setting `browser.dom.window.dump.enabled` explicitly to `true`
it is not possible anymore to capture output in the terminal when the
log method is set to 0. We make sure that
`browser.dom.window.dump.enabled` is set to `true` in that case and
disable it again otherwise, unless Tor Launcher has enabled logging in
a terminal as well.

For context see:
parent 6a9a4f52
...@@ -154,6 +154,16 @@ TorbuttonLogger.prototype = ...@@ -154,6 +154,16 @@ TorbuttonLogger.prototype =
switch (data) { switch (data) {
case "extensions.torbutton.logmethod": case "extensions.torbutton.logmethod":
this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod");
if (this.logmethod === 0) {
} else if (Services.prefs.
getIntPref("extensions.torlauncher.logmethod", 3) !== 0) {
// If Tor Launcher is not available or its log method is not 0
// then let's reset the dump pref.
break; break;
case "extensions.torbutton.loglevel": case "extensions.torbutton.loglevel":
this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment