[vidalia-svn] r3381: Backport r3379 and r3380. (vidalia/branches/vidalia-0.1/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-12-10 23:49:46 -0500 (Wed, 10 Dec 2008)
New Revision: 3381

Modified:
   vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
Log:
Backport r3379 and r3380.


Modified: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2008-12-11 04:28:01 UTC (rev 3380)
+++ vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2008-12-11 04:49:46 UTC (rev 3381)
@@ -234,13 +234,15 @@
 MainWindow::running()
 {
   VidaliaSettings settings;
-  if (_torControl->isRunning()) {
-    /* Tor may be already running, but we still need to connect to it. So,
-     * update our status now. */ 
-    updateTorStatus(Starting);
-    /* Tor was already running */
-    started();
-  } else if (settings.runTorAtStart()) {
+ 
+  /* Initialize _useSavedPassword to true. If Tor is already running when
+   * Vidalia starts, then there is no point in generating a random password.
+   * If Tor is not already running, then this will be set according to the
+   * current configuration in the start() method.
+   */
+  _useSavedPassword = true;
+ 
+  if (settings.runTorAtStart()) {
     /* If we're supposed to start Tor when Vidalia starts, then do it now */
     start();
   }