[vidalia-svn] r3379: If you want Vidalia to connect to your existing Tor automati (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-12-09 22:47:51 -0500 (Tue, 09 Dec 2008)
New Revision: 3379

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
If you want Vidalia to connect to your existing Tor automatically on Vidalia
startup, check the 'Start Tor on Vidalia startup' box. Resolves ticket #444,
though not the way the reporter intended.


Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-12-10 00:00:40 UTC (rev 3378)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-12-10 03:47:51 UTC (rev 3379)
@@ -257,13 +257,8 @@
 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()) {
+ 
+  if (settings.runTorAtStart()) {
     /* If we're supposed to start Tor when Vidalia starts, then do it now */
     start();
   }