Changeset 7977 in ntrip

Timestamp:

Jun 30, 2016, 5:05:55 PM (8 years ago)

Author:

stuerze

Message:

mionor changes to allow programm interruption by Ctrl+C in case of raw file processing

Location:

branches/BNC_2.12/src

Files:

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

branches/BNC_2.12/src/bnccore.h

@@ -71 +71 @@
   void             startPPP();
   void             stopPPP();
+  int              sigintReceived;  
 
   QMap<int, bncTableItem*> _uploadTableItems;

branches/BNC_2.12/src/bncgetthread.cpp

@@ -468 +468 @@
         QCoreApplication::processEvents();
 
-        if (data.isEmpty()) {
-          cout << "no more data" << endl;
+        if (data.isEmpty() || BNC_CORE->sigintReceived) {
+          cout << "no more data or Ctrl-C received" << endl;
           BNC_CORE->stopCombination();
           BNC_CORE->stopPPP();
@@ -641 +641 @@
 #endif
     }
-
-    delete _query;
+    if (_query) {
+      delete _query;
+    }
     if      (_ntripVersion == "U") {
       _query = new bncNetQueryUdp();

branches/BNC_2.12/src/bncmain.cpp

@@ -60 +60 @@
 void catch_signal(int) {
   cout << "Program Interrupted by Ctrl-C" << endl;
+  BNC_CORE->sigintReceived = 1;
   qApp->quit();
 }
@@ -483 +484 @@
     // -----------------------------
     else {
+      BNC_CORE->sigintReceived = 0;
       BNC_CORE->setMode(t_bncCore::batchPostProcessing);
       BNC_CORE->startPPP();