[vidalia-svn] r2485: Use the saved value of the 'Start a proxy ...' checkbox to d (in vidalia/trunk: . src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-04-05 00:09:23 -0400 (Sat, 05 Apr 2008)
New Revision: 2485

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
 r311@lysithea:  edmanm | 2008-04-05 00:08:52 -0400
 Use the saved value of the 'Start a proxy ...' checkbox to decide whether to
 run a proxy on startup, instead of assuming a non-empty ProxyExecutable means
 "Yes, please do."



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r311] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-04-05 04:09:20 UTC (rev 2484)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-04-05 04:09:23 UTC (rev 2485)
@@ -213,7 +213,8 @@
   }
 
   /* Start the proxy server, if configured */
-  startProxy();
+  if (settings.runProxyAtStart())
+    startProxy();
 }
 
 /** Terminate the Tor process if it is being run under Vidalia, disconnect all
@@ -437,9 +438,7 @@
 {
   VidaliaSettings settings;
   QString executable = settings.getProxyExecutable();
-  
-  if (!executable.isEmpty())
-    _proxyProcess->start(executable, settings.getProxyExecutableArguments());
+  _proxyProcess->start(executable, settings.getProxyExecutableArguments());
 }
 
 /** Called when the proxy server fails to start, for example, because