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

Display "Copy Tor Log" button in wizard after bootstrap error.

parent dbab2d64
......@@ -112,6 +112,9 @@ function initDialog()
cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling);
}
if (gTorProcessService.TorBootstrapErrorOccurred)
wizardShowCopyLogButton();
// Use "Connect" as the finish button label (on the last wizard page)..
var finishBtn = document.documentElement.getButton("finish");
if (finishBtn)
......
......@@ -210,6 +210,12 @@ TorProcessService.prototype =
return this.mIsBootstrapDone;
},
get TorBootstrapErrorOccurred()
{
return this.mBootstrapErrorOccurred;
},
TorClearBootstrapError: function()
{
this.mLastTorWarningPhase = null;
......@@ -220,6 +226,7 @@ TorProcessService.prototype =
// Private Member Variables ////////////////////////////////////////////////
mIsTorProcessReady: false,
mIsBootstrapDone: false,
mBootstrapErrorOccurred: false,
mIsQuitting: false,
mObsSvc: null,
mProtocolSvc: null,
......@@ -359,6 +366,7 @@ TorProcessService.prototype =
if (100 == aStatusObj.PROGRESS)
{
this.mIsBootstrapDone = true;
this.mBootstrapErrorOccurred = false;
TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, false);
}
else
......@@ -367,6 +375,7 @@ TorProcessService.prototype =
if (aStatusObj._errorOccurred)
{
this.mBootstrapErrorOccurred = true;
TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true);
TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.WARNING);
......
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