[vidalia-svn] r2121: The other half of r2120. (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-11-21 18:18:49 -0500 (Wed, 21 Nov 2007)
New Revision: 2121

Modified:
   trunk/
   trunk/src/gui/config/advancedpage.cpp
Log:
 r2129@lysithea:  edmanm | 2007-11-21 18:15:49 -0500
 The other half of r2120.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2129] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/gui/config/advancedpage.cpp
===================================================================
--- trunk/src/gui/config/advancedpage.cpp	2007-11-21 20:31:28 UTC (rev 2120)
+++ trunk/src/gui/config/advancedpage.cpp	2007-11-21 23:18:49 UTC (rev 2121)
@@ -134,7 +134,11 @@
     QString dataDir = ui.lineTorDataDirectory->text();
     if (dataDir != _settings->getDataDirectory())
       _settings->setDataDirectory(dataDir);
+  } else {
+    _settings->setTorrc(ui.lineTorConfig->text());
+    _settings->setDataDirectory(ui.lineTorDataDirectory->text());
   }
+
   _settings->setControlAddress(controlAddress);
   _settings->setControlPort(ui.lineControlPort->text().toUShort());
   _settings->setUser(ui.lineUser->text());