[vidalia-svn] r2176: If we connected to an existing Tor, then use the saved contr (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-05 00:09:29 -0500 (Wed, 05 Dec 2007)
New Revision: 2176

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
Log:
 r2227@lysithea:  edmanm | 2007-12-05 00:09:14 -0500
 If we connected to an existing Tor, then use the saved control password to
 authenticate.



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

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-12-05 05:09:22 UTC (rev 2175)
+++ trunk/src/gui/mainwindow.cpp	2007-12-05 05:09:29 UTC (rev 2176)
@@ -536,6 +536,7 @@
   /* Check if Tor is already running separately */
   if (net_test_connect(settings.getControlAddress(),
                        settings.getControlPort())) {
+    _controlPassword = settings.getControlPassword();
     started();
     return;
   }