commit 7b1b686808bcf516ee8ad9dfb94c77b0cdc4c71d Author: Tomas Touceda chiiph@torproject.org Date: Fri Aug 12 09:33:30 2011 -0300

Make _autoControlPort available when not using autoconfig

_autoControlPort is sent by an env var to TorButton, but it was only set when auto configuring *Port. --- src/vidalia/MainWindow.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 4b2bf14..b1aff22 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1161,10 +1161,11 @@ MainWindow::started() } } else { /* Try to connect to Tor's control port */ - if(settings.getControlMethod() == ControlMethod::Port) + if(settings.getControlMethod() == ControlMethod::Port) { _torControl->connect(settings.getControlAddress(), settings.getControlPort()); - else + _autoControlPort = settings.getControlPort(); + } else _torControl->connect(settings.getSocketPath()); } setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));