Changeset 5775 in ntrip for trunk/BNC/src/PPP


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

Legend:

Unmodified
Added
Removed

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

    r5774 r5775  
    9595  while (it.hasNext()) {
    9696    t_pppThread* pppThread = it.next();
    97     pppThread->stop();
     97    pppThread->exit();
    9898  }
    9999  _pppThreads.clear();

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

    r5774 r5775  
    5656  _opt   = opt;
    5757  _pppRun = 0;
     58  connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
     59
    5860  connect(this, SIGNAL(newMessage(QByteArray,bool)),
    5961          BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    … …  
    6365////////////////////////////////////////////////////////////////////////////
    6466t_pppThread::~t_pppThread() {
     67  cout << "~t_pppThread" << endl;
    6568  delete _pppRun;
    6669}
    … …  
    7174  try {
    7275    _pppRun = new t_pppRun(_opt);
     76    QThread::exec();
    7377  }
    7478  catch (pppExcept exc) {
    … …  
    7680    emit newMessage(QByteArray(exc.what().c_str()), true);
    7781  }
    78   QThread::exec();
    79 }
    80 
    81 //
    82 ////////////////////////////////////////////////////////////////////////////
    83 void t_pppThread::stop() {
    84   this->exit();
    85   delete _pppRun; _pppRun = 0;
    86   this->wait(1000);
    87   this->deleteLater();
    8882}
    8983
    … …  
    120114////////////////////////////////////////////////////////////////////////////
    121115t_pppRun::~t_pppRun() {
     116  cout << "~t_pppRun" << endl;
    122117}
    123118
    … …  
    156151  QStringListIterator it(corrList);
    157152  while (it.hasNext()) {
     153    it.next();
    158154  }
    159155
    … …  
    167163  QMutexLocker locker(&_mutex);
    168164
    169 
    170165  vector<t_pppSatObs> satObs;
    171166  t_output            output;

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

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