Changeset 9822 in ntrip for trunk

Timestamp:

Sep 12, 2022, 11:03:54 AM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• bncmain.cpp (modified) (6 diffs)

trunk/BNC/src/bnccore.cpp

@@ -139 +139 @@
 
   delete _dateAndTimeGPS;
-  delete _rawFile;
-  delete _bncComb;
+  if (_rawFile) {
+    delete _rawFile;
+  }
+
+  if (_bncComb) {
+    delete _bncComb;
+    _bncComb = 0;
+  }
   delete _pppMain;
 }

trunk/BNC/src/bncmain.cpp

@@ -58 +58 @@
 using namespace std;
 
+
 void catch_SIGINT(int) {
   cout << "Program Interrupted by Ctrl-C" << endl;
   BNC_CORE->sigintReceived = 1;
+  BNC_CORE->stopPPP();
   BNC_CORE->stopCombination();
-  BNC_CORE->stopPPP();
   sleep(2);
   ::exit(0);
@@ -81 +82 @@
   bool       displaySet   = false;
 #endif
-  QByteArray rawFileName;
-  QString    confFileName;
+  QByteArray          rawFileName;
+  QString             confFileName;
+
+  bncWindow*          bncWin = 0;
+  t_reqcEdit*         reqcEdit = 0;
+  t_reqcAnalyze*      reqcAnalyze = 0;
+  t_sp3Comp*          sp3Comp = 0;
+  bncEphUploadCaster* casterEph = 0;
+  bncCaster*          caster = 0;
+  bncRawFile*         rawFile =  0;
+  bncGetThread*       getThread = 0;
 
   QByteArray printHelp =
@@ -98 +108 @@
       "   proxyPort         {Proxy port [integer number]}\n"
       "   sslCaCertPath     {Full path to SSL certificates [character string]}\n"
-      "   sslClientCertPath {Full path to client SSL certificates [character string]}\n"      
+      "   sslClientCertPath {Full path to client SSL certificates [character string]}\n"
       "   sslIgnoreErrors   {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
       "\n"
@@ -422 +432 @@
   }
 
-  bncWindow*          bncWin = 0;
-  t_reqcEdit*         reqcEdit = 0;
-  t_reqcAnalyze*      reqcAnalyze = 0;
-  t_sp3Comp*          sp3Comp = 0;
-  bncEphUploadCaster* casterEph = 0;
-  bncCaster*          caster = 0;
-  bncRawFile*         rawFile =  0;
-  bncGetThread*       getThread = 0;
+
 
 #ifndef WIN32
@@ -505 +508 @@
 
     BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), app->instance(), SLOT(quit()));
+
+    BNC_CORE->connect (caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), app->instance(), SLOT(quit()));
+
     BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true);
 
@@ -535 +541 @@
   // ---------------------
   app->exec();
+
+  // End of application
+  // ------------------
   if (interactive) {
     delete bncWin;