Changeset 5774 in ntrip for trunk/BNC


Ignore:
Timestamp:
Aug 4, 2014, 10:16:07 AM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppClient.cpp

    r5773 r5774  
    118118  else if (ephGlo) {
    119119    _ephPool->putEphemeris(new t_ephGlo(*ephGlo));
    120     LOG << OPT->_roverName <<  " putEphemeirs Glo" << endl;
     120    LOG << OPT->_roverName <<  " putEphemeris Glo" << endl;
    121121  }
    122122  else if (ephGal) {

  • trunk/BNC/src/PPP/pppMain.cpp

    r5765 r5774  
    9595  while (it.hasNext()) {
    9696    t_pppThread* pppThread = it.next();
    97     pppThread->exit();
    98     pppThread->deleteLater();
     97    pppThread->stop();
    9998  }
    10099  _pppThreads.clear();

  • trunk/BNC/src/PPP/pppThread.cpp

    r5772 r5774  
    5454////////////////////////////////////////////////////////////////////////////
    5555t_pppThread::t_pppThread(const t_options* opt) : QThread(0) {
    56   _opt = opt;
     56  _opt   = opt;
     57  _pppRun = 0;
    5758  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    5859          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    … …  
    7677  }
    7778  QThread::exec();
     79}
     80
     81//
     82////////////////////////////////////////////////////////////////////////////
     83void t_pppThread::stop() {
     84  this->exit();
     85  delete _pppRun; _pppRun = 0;
     86  this->wait(1000);
     87  this->deleteLater();
    7888}
    7989

  • trunk/BNC/src/PPP/pppThread.h

    r5766 r5774  
    3939  ~t_pppThread();
    4040  virtual void run();
     41  void stop();
    4142
    4243 signals:
Note: See TracChangeset for help on using the changeset viewer.