Commit 4bbb3e86 authored by Kathleen Brade's avatar Kathleen Brade
Browse files

Bug #10147: Adblock Plus interferes w/Tor Launcher dialog

During progress window init, check the status of the Tor bootstrap
process and close the progress window immediately if bootstrapping is
complete or if an error has occurred.
parent 92bed9d8
......@@ -21,6 +21,21 @@ var gOpenerCallbackFunc; // Set when opened from network settings.
function initDialog()
{
// If tor bootstrap has already finished, just close the progress dialog.
// This situation can occur if bootstrapping is very fast and/or if this
// window opens slowly (observed with Adblock Plus installed).
try
{
var processSvc = Cc["@torproject.org/torlauncher-process-service;1"]
.getService(Ci.nsISupports).wrappedJSObject;
if (processSvc.TorIsBootstrapDone || processSvc.TorBootstrapErrorOccurred)
{
closeThisWindow(processSvc.TorIsBootstrapDone);
return;
}
}
catch (e) { dump(e + "\n"); }
try
{
gObsSvc = Cc["@mozilla.org/observer-service;1"]
......
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