Index: /trunk/BNC/src/bncgetthread.cpp
===================================================================
--- /trunk/BNC/src/bncgetthread.cpp	(revision 7857)
+++ /trunk/BNC/src/bncgetthread.cpp	(revision 7858)
@@ -407,5 +407,16 @@
     delete _nmeaSockets;
   }
+
+#ifdef BNC_DEBUG
+  while (!isFinished()) {
+    wait();
+  }
   delete this;
+#else
+    if (!isRunning()) {
+      delete this;
+    }
+#endif
+
 }
 
Index: /trunk/BNC/src/pppMain.cpp
===================================================================
--- /trunk/BNC/src/pppMain.cpp	(revision 7857)
+++ /trunk/BNC/src/pppMain.cpp	(revision 7858)
@@ -103,4 +103,5 @@
       t_pppThread* pppThread = it.next();
       pppThread->exit();
+#ifdef BNC_DEBUG
       if (BNC_CORE->mode() != t_bncCore::interactive) {
         while(!pppThread->isFinished()) {
@@ -109,4 +110,5 @@
         delete pppThread;
       }
+#endif
     }
     _pppThreads.clear();
Index: /trunk/BNC/src/src.pri
===================================================================
--- /trunk/BNC/src/src.pri	(revision 7857)
+++ /trunk/BNC/src/src.pri	(revision 7858)
@@ -23,4 +23,6 @@
 release:OBJECTS_DIR=.obj/release
 release:MOC_DIR=.moc/release
+
+debug:DEFINES  += BNC_DEBUG
 
 # Include Path