commit 794662a6563e99e9f55b32603cab312842cd264a Author: Tomás Touceda chiiph@torproject.org Date: Mon May 28 20:53:40 2012 -0300

Disable run at start for TBB users --- changes/disableRunAtStart | 3 +++ src/vidalia/config/GeneralPage.cpp | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart new file mode 100644 index 0000000..f8890fc --- /dev/null +++ b/changes/disableRunAtStart @@ -0,0 +1,3 @@ + o Disable "Run Vidalia when my system starts" if the + BrowserExecutable config option is set. This will avoid issues with + TBB users starting Vidalia the wrong way. \ No newline at end of file diff --git a/src/vidalia/config/GeneralPage.cpp b/src/vidalia/config/GeneralPage.cpp index b6db202..6b0a1ba 100644 --- a/src/vidalia/config/GeneralPage.cpp +++ b/src/vidalia/config/GeneralPage.cpp @@ -47,6 +47,11 @@ GeneralPage::GeneralPage(QWidget *parent) #if !defined(USE_AUTOUPDATE) ui.grpSoftwareUpdates->setVisible(false); #endif + + if (_vidaliaSettings->getBrowserExecutable().length() > 0) { + ui.lineHorizontalSeparator->setVisible(false); + ui.chkRunVidaliaAtSystemStartup->setVisible(false); + } }

/** Destructor */