Changeset 5927 in ntrip


Ignore:
Timestamp:
Aug 15, 2014, 9:37:22 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppRun.cpp

    r5925 r5927  
    423423  }
    424424
     425  emit finished();
     426
    425427  if (BNC_CORE->mode() != t_bncCore::interactive) {
    426428    qApp->exit(0);
    427429  }
    428   else {
    429     emit finished();
    430     deleteLater();
    431   }
    432430}
    433431
  • trunk/BNC/src/PPP/pppThread.cpp

    r5906 r5927  
    6161  _pppRun    = 0;
    6262
    63   connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
    64 
    6563  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    6664          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
     
    7977  try {
    8078    _pppRun = new t_pppRun(_opt);
     79    connect(_pppRun, SIGNAL(finished()), this, SLOT(slotPPPfinished()));
    8180    if (_opt->_realTime) {
    8281      if (_ownThread) {
     
    8988  }
    9089  catch (t_except exc) {
    91     _pppRun = 0;
     90    delete _pppRun; _pppRun = 0;
    9291    emit newMessage(QByteArray(exc.what().c_str()), true);
    9392  }
    9493}
    9594
     95// Run (virtual)
     96////////////////////////////////////////////////////////////////////////////
     97void t_pppThread::slotPPPfinished() {
     98  delete _pppRun; _pppRun = 0;
     99}
  • trunk/BNC/src/PPP/pppThread.h

    r5905 r5927  
    2323 signals:
    2424  void newMessage(QByteArray msg, bool showOnScreen);
     25  void pppFinished();
     26
     27 private slots:
     28  void slotPPPfinished();
    2529
    2630 private:
Note: See TracChangeset for help on using the changeset viewer.