commit e80360ccdcdb48ab1dcb0f9bf6a0774c1e8fdf8c Author: Kathy Brade <brade@torproject.org> Date: Wed Apr 17 11:10:37 2013 -0400 Fix TOR_SKIP_LAUNCH=1 regression (don't show "Waiting for Tor to start"). --- src/chrome/content/network-settings.js | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 069b8d1..9bdd527 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -82,18 +82,19 @@ function initDialog() gObsService = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); - if (gTorProcessService.TorIsProcessReady) + if (TorLauncherUtil.shouldStartAndOwnTor && + !gTorProcessService.TorIsProcessReady) { - showOrHideSettings(true, false); - readTorSettings(); - } - else - { - showOrHideSettings(false, true); + showOrHideSettings(false, true); // Show "Waiting for tor to start" gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); } + else + { + showOrHideSettings(true, false); + readTorSettings(); + } TorLauncherLogger.log(2, "initDialog done"); }