Changeset 7856 in ntrip


Ignore:
Timestamp:
Apr 7, 2016, 6:20:00 PM (3 years ago)
Author:
stuerze
Message:

minor changes to allow a clean end of program

Location:
trunk/BNC/src
Files:
5 edited

Legend:

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

    r7718 r7856  
    141141  delete _rawFile;
    142142  delete _bncComb;
     143  delete _pppMain;
    143144}
    144145
  • trunk/BNC/src/pppMain.cpp

    r7850 r7856  
    103103      t_pppThread* pppThread = it.next();
    104104      pppThread->exit();
     105      if (BNC_CORE->mode() != t_bncCore::interactive) {
     106        while(!pppThread->isFinished()) {
     107          pppThread->wait();
     108        }
     109        delete pppThread;
     110      }
    105111    }
    106112    _pppThreads.clear();
  • trunk/BNC/src/pppMain.h

    r7502 r7856  
    55#include "pppOptions.h"
    66#include "pppThread.h"
     7#include "bnccore.h"
    78
    89namespace BNC_PPP {
  • trunk/BNC/src/pppRun.cpp

    r7815 r7856  
    224224  delete _snxtroFile;
    225225  while (!_epoData.empty()) {
     226    delete _epoData.front();
    226227    _epoData.pop_front();
    227228  }
  • trunk/BNC/src/pppThread.cpp

    r6046 r7856  
    3636 * Created:    29-Jul-2014
    3737 *
    38  * Changes:   
     38 * Changes:
    3939 *
    4040 * -----------------------------------------------------------------------*/
     
    6262  connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
    6363
    64   connect(this, SIGNAL(newMessage(QByteArray,bool)), 
     64  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    6565          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    6666}
     
    7575////////////////////////////////////////////////////////////////////////////
    7676void t_pppThread::run() {
    77  
     77
    7878  try {
    7979    _pppRun = new t_pppRun(_opt);
Note: See TracChangeset for help on using the changeset viewer.