Commit 2014143e authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

Bug 20429: Do not open progress window if TOR_SKIP_LAUNCH=1

After saving tor settings, if TOR_SKIP_LAUNCH=1 or if
extensions.torlauncher.start_tor is false, avoid opening the progress
dialog to monitor bootstrap progress. This avoids displaying a progress
window that will not make progress (and the situation was made worse by
the fact that clicking Cancel set DisableNetwork=1).

Also, leave the network settings dialog open if we fail to set
DisableNetwork=0.
parent c1254f11
......@@ -1055,11 +1055,22 @@ function useSettings()
{
var settings = {};
settings[kTorConfKeyDisableNetwork] = false;
setConfAndReportErrors(settings, null);
let didApply = setConfAndReportErrors(settings, null);
if (!didApply)
return;
gProtocolSvc.TorSendCommand("SAVECONF");
gTorProcessService.TorClearBootstrapError();
// If we are not responsible for starting tor we do not monitor bootstrap
// status, so just close this dialog and return rather than opening the
// progress dialog (which will make no progress).
if (!TorLauncherUtil.shouldStartAndOwnTor)
{
close();
return;
}
gIsBootstrapComplete = gTorProcessService.TorIsBootstrapDone;
if (!gIsBootstrapComplete)
openProgressDialog();
......
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