[vidalia-svn] r1954: If we prompt the user for a control password and they enter (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-29 16:58:59 -0400 (Sat, 29 Sep 2007)
New Revision: 1954

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
Log:
 r1973@lysithea:  edmanm | 2007-09-29 15:58:00 -0400
 If we prompt the user for a control password and they enter one, don't keep
 trying to use our randomly generated password.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r1973] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-09-29 20:58:49 UTC (rev 1953)
+++ trunk/src/gui/mainwindow.cpp	2007-09-29 20:58:59 UTC (rev 1954)
@@ -839,6 +839,7 @@
       TorSettings settings;
       settings.setAuthenticationMethod(TorSettings::PasswordAuth);
       settings.setControlPassword(password);
+      settings.setUseRandomPassword(false);
       retry = true;
     }
   } else {