[GNUnet-SVN] r9885 - gnunet-qt/src/plugins/general

[gnunet]

Author: durner
Date: 2009-12-23 23:02:10 +0100 (Wed, 23 Dec 2009)
New Revision: 9885

Modified:
   gnunet-qt/src/plugins/general/checkDaemonThread.cc
   gnunet-qt/src/plugins/general/general.cc
Log:
fix daemon check

Modified: gnunet-qt/src/plugins/general/checkDaemonThread.cc
===================================================================
--- gnunet-qt/src/plugins/general/checkDaemonThread.cc  2009-12-23 20:22:30 UTC 
(rev 9884)
+++ gnunet-qt/src/plugins/general/checkDaemonThread.cc  2009-12-23 22:02:10 UTC 
(rev 9885)
@@ -57,6 +57,7 @@
 
 GCheckDaemonThread::~GCheckDaemonThread()
 {
+  stop();
   wait();
 }
 
@@ -119,8 +120,8 @@
     emit running(check);
 
     sleepEnd = GNUNET_get_time() + 5 * GNUNET_CRON_SECONDS;
-    while (!stopRequested && sleepEnd < GNUNET_get_time())
-      usleep(100);
+    while (!stopRequested && sleepEnd > GNUNET_get_time())
+      msleep(100);
   }
 }
 

Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc    2009-12-23 20:22:30 UTC (rev 
9884)
+++ gnunet-qt/src/plugins/general/general.cc    2009-12-23 22:02:10 UTC (rev 
9885)
@@ -53,6 +53,8 @@
   pbStartStop->setEnabled(false);
   runs = 0;
   isRunning = pending = false;
+
+  checkDaemonThread->start();
 }
 
 GGeneralPlugin::~GGeneralPlugin()