Commit fd61cb0e authored by Kathleen Brade's avatar Kathleen Brade
Browse files

Bug 15704: Do not enable network if wizard is opened.

If default bridges were configured and the network settings wizard was
opened during a subsequent launch of Tor Browser (e.g., after a failed
bootstrap), Tor Launcher was incorrectly setting DisableNetwork=0.
parent a37371ac
......@@ -559,12 +559,17 @@ TorProcessService.prototype =
var errObj = {};
var didSucceed = this.mProtocolSvc.TorSetConfWithReply(settings, errObj);
settings = {};
settings["DisableNetwork"] = false;
if (!this.mProtocolSvc.TorSetConfWithReply(settings,
(didSucceed) ? errObj : null))
// If the network settings wizard was not opened at startup, enable the
// network so that bootstrapping will proceed with the default bridges.
if (!TorLauncherUtil.shouldShowNetworkSettings)
{
didSucceed = false;
settings = {};
settings["DisableNetwork"] = false;
if (!this.mProtocolSvc.TorSetConfWithReply(settings,
(didSucceed) ? errObj : null))
{
didSucceed = false;
}
}
if (didSucceed)
......
Markdown is supported
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