Changeset 7854 in ntrip for trunk/BNC/src

Timestamp:

Apr 7, 2016, 9:46:49 AM (9 years ago)

Author:

stuerze

Message:

minor changes to allow a clean end of program

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (1 diff)
• bncgetthread.cpp (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)

trunk/BNC/src/bnccaster.cpp

@@ -130 +130 @@
   while(it.hasNext()){
     bncGetThread* thread = it.next();
+    disconnect(thread, 0, 0, 0);
+    _staIDs.removeAll(thread->staID());
+    _threads.removeAll(thread);
     thread->terminate();
   }

trunk/BNC/src/bncgetthread.cpp

@@ -397 +397 @@
 void bncGetThread::terminate() {
   _isToBeDeleted = true;
-  if (!isRunning()) {
-    delete this;
-  }
-  _nmeaPortsMap.remove(_staID);
-  delete _nmeaServer;
-  delete _nmeaSockets;
+
+  if(_nmeaPortsMap.contains(_staID)) {
+    _nmeaPortsMap.remove(_staID);
+  }
+  if (_nmeaServer) {
+    delete _nmeaServer;
+  }
+  if (_nmeaSockets) {
+    delete _nmeaSockets;
+  }
+  delete this;
 }
 

trunk/BNC/src/bncmain.cpp

@@ -57 +57 @@
 using namespace std;
 
+
 void catch_signal(int) {
   cout << "Program Interrupted by Ctrl-C" << endl;
-  exit(0);
+  qApp->quit();
 }
 
@@ -497 +498 @@
     delete bncWin;
   }
+  else {
+    BNC_CORE->stopPPP();
+    BNC_CORE->stopCombination();
+  }
   if (caster) {
-    delete caster;
+    delete caster; caster = 0; BNC_CORE->setCaster(0);
   }
   if (casterEph) {
-    delete casterEph;
+    delete casterEph; casterEph = 0;
   }
   if (rawFile) {