[vidalia-svn] r1315: Return true if either Tor is already running as a service, o (trunk/src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-08 02:22:35 -0400 (Sun, 08 Oct 2006)
New Revision: 1315

Modified:
   trunk/src/gui/config/advancedpage.cpp
Log:
Return true if either Tor is already running as a
service, or if we plan on installing Tor as a service.

Modified: trunk/src/gui/config/advancedpage.cpp
===================================================================
--- trunk/src/gui/config/advancedpage.cpp	2006-10-08 05:11:22 UTC (rev 1314)
+++ trunk/src/gui/config/advancedpage.cpp	2006-10-08 06:22:35 UTC (rev 1315)
@@ -144,22 +144,14 @@
 bool
 AdvancedPage::useService()
 {
-  bool use = false;
+  TorService s(_settings->getExecutable(), _settings->getTorrc());
 
-  /* If we think we're supposed to be using a service we'd better make
-     sure that the service still actually exists since the last time we checked.
-  */
-  
-  if (_settings->getUseService()) {
-    TorService* s = new TorService(_settings->getExecutable(),
-                                   _settings->getTorrc());
-    use = s->isInstalled();
-    delete s;
-
-    /* No point in trying to use a broken or non-existent service */
-    if (!use) _settings->setUseService(false);
+  /* If the Tor service was previously installed, or we plan on running
+   * Tor as a service, return true. */
+  if (s.isInstalled() || _settings->getUseService()) {
+    return true;
   }
-  return use;
+  return false;
 }
 
 /** Installs or removes the Tor service as necessary. */