[vidalia-svn] r1681: Don't wait forever for the Tor process to stop. (in trunk: . src/control)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-03-18 22:42:43 -0400 (Sun, 18 Mar 2007)
New Revision: 1681

Modified:
   trunk/
   trunk/src/control/torprocess.cpp
Log:
 r1744@adrastea:  edmanm | 2007-03-18 22:20:51 -0400
 Don't wait forever for the Tor process to stop.



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

Modified: trunk/src/control/torprocess.cpp
===================================================================
--- trunk/src/control/torprocess.cpp	2007-03-19 02:42:30 UTC (rev 1680)
+++ trunk/src/control/torprocess.cpp	2007-03-19 02:42:43 UTC (rev 1681)
@@ -86,7 +86,7 @@
   terminate();
 
   /* Wait for it to complete */
-  if (!waitForFinished(-1)) {
+  if (!waitForFinished(5000)) {
     vWarn("Tor failed to stop: %1").arg(errorString());
     if (errmsg) {
       *errmsg =