Don't close the tty before invoking pppd. It makes it difficult to use.

1 files changed, 4 insertions, 1 deletions

diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index 798431b..6905d79 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -783,97 +783,100 @@ void ConnectWidget::timerEvent(QTimerEvent *) {
   if(vmain == 150) {
     if(!expecting) {
       writeline(_ifaceppp->data()->modemAnswerStr());
       setExpect(_ifaceppp->data()->modemAnswerResp());
 
       vmain = 2;
       scriptindex++;
       return;
     }
   }
 
   if(vmain == 30) {
 //     if (termwindow->isVisible())
 //       return;
 //     if (termwindow->pressedContinue())
 //       vmain = 10;
 //     else
       cancelbutton();
   }
 
   if(vmain == 10) {
     if(!expecting) {
 
       int result;
 
       timeout_timer->stop();
       if_timeout_timer->stop(); // better be sure.
 
       // stop reading of data
       _ifaceppp->modem()->stop();
 
       if(_ifaceppp->data()->authMethod() == AUTH_TERMINAL) {
       //     if (termwindow) {
 // 	  delete termwindow;
 // 	  termwindow = 0L;
 // 	  this->show();
 // 	} else {
 // 	  termwindow = new LoginTerm(0L, 0L);
 // 	  hide();
 // 	  termwindow->show();
 // 	  vmain = 30;
 // 	  return;
 // 	}
       }
 
       // Close the tty. This prevents the QTimer::singleShot() in
       // Modem::readtty() from re-enabling the socket notifier.
       // The port is still held open by the helper process.
-      _ifaceppp->modem()->closetty();
+
+      /* Er, there _is_ not QTimer::singleShot() in Modem::readtty(),
+	 and closing the thing prevents pppd from using it later. */
+      //_ifaceppp->modem()->closetty();
 
       killTimer( main_timer_ID );
 
       if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000);
       qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000);
 
       // find out PPP interface and notify the stats module
 //      stats->setUnit(pppInterfaceNumber());
 
       qApp->flushX();
       semaphore = true;
       result = execppp();
 
       emit debugMessage(i18n("Starting pppd..."));
       qDebug("execppp() returned with return-code %i", result );
 
       if(result) {
         if(!_ifaceppp->data()->autoDNS())
           adddns( _ifaceppp );
 
 	// O.K we are done here, let's change over to the if_waiting loop
 	// where we wait for the ppp if (interface) to come up.
 
 	emit if_waiting_signal();
       } else {
 
 	// starting pppd wasn't successful. Error messages were
 	// handled by execppp();
 	if_timeout_timer->stop();
 	this->hide();
 	messg->setText("");
 //	p_kppp->quit_b->setFocus();
 //	p_kppp->show();
 	qApp->processEvents();
 	_ifaceppp->modem()->hangup();
 	emit stopAccounting();
 //	p_kppp->con_win->stopClock();
 	_ifaceppp->modem()->closetty();
         _ifaceppp->modem()->unlockdevice();
 
       }
 
       return;
     }
   }
 
   // this is a "wait until cancel" entry