Index: /trunk/BNC/bnccaster.cpp
===================================================================
--- /trunk/BNC/bnccaster.cpp	(revision 1398)
+++ /trunk/BNC/bnccaster.cpp	(revision 1399)
@@ -118,5 +118,4 @@
     bncGetThread* thread = it.next();
     thread->terminate();
-    thread->wait(3000);
     delete thread;
   }
@@ -436,5 +435,4 @@
       _threads.removeAll(thread);
       thread->terminate();
-      thread->wait(3000);
       delete thread;
     }
Index: /trunk/BNC/bncgetthread.cpp
===================================================================
--- /trunk/BNC/bncgetthread.cpp	(revision 1398)
+++ /trunk/BNC/bncgetthread.cpp	(revision 1399)
@@ -815,4 +815,5 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncGetThread::exit(int exitCode) {
+  terminate();
   if (exitCode!= 0) {
     emit error(_staID);
@@ -820,4 +821,5 @@
   QThread::exit(exitCode);
   terminate();
+  wait(1000);
 }