[vidalia-svn] r1865: Remove some overlap that could result in duplicate signals b (in trunk: . src/control)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-24 19:16:16 -0400 (Fri, 24 Aug 2007)
New Revision: 1865

Modified:
   trunk/
   trunk/src/control/torcontrol.cpp
Log:
 r2052@adrastea:  edmanm | 2007-08-24 18:24:45 -0400
 Remove some overlap that could result in duplicate signals being emitted.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2052] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/control/torcontrol.cpp
===================================================================
--- trunk/src/control/torcontrol.cpp	2007-08-23 23:31:35 UTC (rev 1864)
+++ trunk/src/control/torcontrol.cpp	2007-08-24 23:16:16 UTC (rev 1865)
@@ -165,12 +165,9 @@
 {
   closeTorProcess();
   
-  if (_controlConn->status() == ControlConnection::Connecting) {
+  if (_controlConn->status() == ControlConnection::Connecting)
     _controlConn->cancelConnect();
-  } else {
-    disconnect();
-  }
-
+  
   emit stopped();
   emit stopped(exitCode, exitStatus);
 }
@@ -270,13 +267,6 @@
 
   /* Let interested parties know we lost our control connection */
   emit disconnected();
-  
-  if (!isVidaliaRunningTor()) {
-    /* If we're not running our own Tor, then we interpret the closing of 
-     * our control connection to mean that Tor stopped. */
-    emit stopped();
-    emit stopped(0, QProcess::NormalExit);
-  }
 }
 
 /** Check if the control socket is connected */