[tor-commits] [vidalia/alpha] Always set DataDirectory and return to the default ControlPort when toggling off auto

[chiiph at torproject.org]

commit 826ca762eeaa274a0a86eebdbc592499cf6463ef
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Feb 3 22:27:01 2012 -0300

    Always set DataDirectory and return to the default ControlPort when toggling off auto
---
 src/vidalia/config/AdvancedPage.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index ebee44f..44216c7 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -193,8 +193,7 @@ AdvancedPage::save(QString &errmsg)
     }
 
     QString dataDir = ui.lineTorDataDirectory->text();
-    if (dataDir != _settings->getDataDirectory())
-      _settings->setDataDirectory(dataDir);
+    _settings->setDataDirectory(dataDir);
   }
 
   if(!ui.chkAuto->isChecked()) {
@@ -434,6 +433,7 @@ AdvancedPage::toggleAuto(bool)
   ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked());
   ui.label->setVisible(!ui.chkAuto->isChecked());
   ui.lineControlPort->setVisible(!ui.chkAuto->isChecked());
+  ui.lineControlPort->setText("9051");
 }
 
 void