Changeset 9822 in ntrip


Ignore:
Timestamp:
Sep 12, 2022, 11:03:54 AM (3 weeks ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r9819 r9822  
    139139
    140140  delete _dateAndTimeGPS;
    141   delete _rawFile;
    142   delete _bncComb;
     141  if (_rawFile) {
     142    delete _rawFile;
     143  }
     144
     145  if (_bncComb) {
     146    delete _bncComb;
     147    _bncComb = 0;
     148  }
    143149  delete _pppMain;
    144150}
  • trunk/BNC/src/bncmain.cpp

    r9795 r9822  
    5858using namespace std;
    5959
     60
    6061void catch_SIGINT(int) {
    6162  cout << "Program Interrupted by Ctrl-C" << endl;
    6263  BNC_CORE->sigintReceived = 1;
     64  BNC_CORE->stopPPP();
    6365  BNC_CORE->stopCombination();
    64   BNC_CORE->stopPPP();
    6566  sleep(2);
    6667  ::exit(0);
     
    8182  bool       displaySet   = false;
    8283#endif
    83   QByteArray rawFileName;
    84   QString    confFileName;
     84  QByteArray          rawFileName;
     85  QString             confFileName;
     86
     87  bncWindow*          bncWin = 0;
     88  t_reqcEdit*         reqcEdit = 0;
     89  t_reqcAnalyze*      reqcAnalyze = 0;
     90  t_sp3Comp*          sp3Comp = 0;
     91  bncEphUploadCaster* casterEph = 0;
     92  bncCaster*          caster = 0;
     93  bncRawFile*         rawFile =  0;
     94  bncGetThread*       getThread = 0;
    8595
    8696  QByteArray printHelp =
     
    98108      "   proxyPort         {Proxy port [integer number]}\n"
    99109      "   sslCaCertPath     {Full path to SSL certificates [character string]}\n"
    100       "   sslClientCertPath {Full path to client SSL certificates [character string]}\n"     
     110      "   sslClientCertPath {Full path to client SSL certificates [character string]}\n"
    101111      "   sslIgnoreErrors   {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
    102112      "\n"
     
    422432  }
    423433
    424   bncWindow*          bncWin = 0;
    425   t_reqcEdit*         reqcEdit = 0;
    426   t_reqcAnalyze*      reqcAnalyze = 0;
    427   t_sp3Comp*          sp3Comp = 0;
    428   bncEphUploadCaster* casterEph = 0;
    429   bncCaster*          caster = 0;
    430   bncRawFile*         rawFile =  0;
    431   bncGetThread*       getThread = 0;
     434
    432435
    433436#ifndef WIN32
     
    505508
    506509    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), app->instance(), SLOT(quit()));
     510
     511    BNC_CORE->connect (caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), app->instance(), SLOT(quit()));
     512
    507513    BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true);
    508514
     
    535541  // ---------------------
    536542  app->exec();
     543
     544  // End of application
     545  // ------------------
    537546  if (interactive) {
    538547    delete bncWin;
Note: See TracChangeset for help on using the changeset viewer.