Changeset 5927 in ntrip

Timestamp:

Aug 15, 2014, 9:37:22 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppRun.cpp (modified) (1 diff)
• pppThread.cpp (modified) (3 diffs)
• pppThread.h (modified) (1 diff)

trunk/BNC/src/PPP/pppRun.cpp

@@ -423 +423 @@
   }
 
+  emit finished();
+
   if (BNC_CORE->mode() != t_bncCore::interactive) {
     qApp->exit(0);
   }
-  else {
-    emit finished();
-    deleteLater();
-  }
 }
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -61 +61 @@
   _pppRun    = 0;
 
-  connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
-
   connect(this, SIGNAL(newMessage(QByteArray,bool)), 
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
@@ -79 +77 @@
   try {
     _pppRun = new t_pppRun(_opt);
+    connect(_pppRun, SIGNAL(finished()), this, SLOT(slotPPPfinished()));
     if (_opt->_realTime) {
       if (_ownThread) {
@@ -89 +88 @@
   }
   catch (t_except exc) {
-    _pppRun = 0;
+    delete _pppRun; _pppRun = 0;
     emit newMessage(QByteArray(exc.what().c_str()), true);
   }
 }
 
+// Run (virtual)
+////////////////////////////////////////////////////////////////////////////
+void t_pppThread::slotPPPfinished() {
+  delete _pppRun; _pppRun = 0;
+}

trunk/BNC/src/PPP/pppThread.h

@@ -23 +23 @@
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
+  void pppFinished();
+
+ private slots:
+  void slotPPPfinished();
 
  private: