Changeset 7856 in ntrip for trunk/BNC

Timestamp:

Apr 7, 2016, 6:20:00 PM (9 years ago)

Author:

stuerze

Message:

minor changes to allow a clean end of program

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• pppMain.cpp (modified) (1 diff)
• pppMain.h (modified) (1 diff)
• pppRun.cpp (modified) (1 diff)
• pppThread.cpp (modified) (3 diffs)

trunk/BNC/src/bnccore.cpp

@@ -141 +141 @@
   delete _rawFile;
   delete _bncComb;
+  delete _pppMain;
 }
 

trunk/BNC/src/pppMain.cpp

@@ -103 +103 @@
       t_pppThread* pppThread = it.next();
       pppThread->exit();
+      if (BNC_CORE->mode() != t_bncCore::interactive) {
+        while(!pppThread->isFinished()) {
+          pppThread->wait();
+        }
+        delete pppThread;
+      }
     }
     _pppThreads.clear();

trunk/BNC/src/pppMain.h

@@ -5 +5 @@
 #include "pppOptions.h"
 #include "pppThread.h"
+#include "bnccore.h"
 
 namespace BNC_PPP {

trunk/BNC/src/pppRun.cpp

@@ -224 +224 @@
   delete _snxtroFile;
   while (!_epoData.empty()) {
+    delete _epoData.front(); 
     _epoData.pop_front();
   }

trunk/BNC/src/pppThread.cpp

@@ -36 +36 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -62 +62 @@
   connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)),
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 }
@@ -75 +75 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppThread::run() {
-  
+
   try {
     _pppRun = new t_pppRun(_opt);