author | dwmw2 <dwmw2> | 2003-06-07 15:49:06 (UTC) |
---|---|---|
committer | dwmw2 <dwmw2> | 2003-06-07 15:49:06 (UTC) |
commit | e02157a68d186a17778d3b393a327660df5fbac3 (patch) (unidiff) | |
tree | 3abede8e557239579041511b973c15a2d9e0f273 | |
parent | 1a7addc9f586b35c4c4f5025030349c3064bc3b7 (diff) | |
download | opie-e02157a68d186a17778d3b393a327660df5fbac3.zip opie-e02157a68d186a17778d3b393a327660df5fbac3.tar.gz opie-e02157a68d186a17778d3b393a327660df5fbac3.tar.bz2 |
Don't close the tty before invoking pppd. It makes it difficult to use.
-rw-r--r-- | noncore/settings/networksettings/ppp/connect.cpp | 5 |
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 | |||
@@ -819,25 +819,28 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
819 | // } else { | 819 | // } else { |
820 | // termwindow = new LoginTerm(0L, 0L); | 820 | // termwindow = new LoginTerm(0L, 0L); |
821 | // hide(); | 821 | // hide(); |
822 | // termwindow->show(); | 822 | // termwindow->show(); |
823 | // vmain = 30; | 823 | // vmain = 30; |
824 | // return; | 824 | // return; |
825 | // } | 825 | // } |
826 | } | 826 | } |
827 | 827 | ||
828 | // Close the tty. This prevents the QTimer::singleShot() in | 828 | // Close the tty. This prevents the QTimer::singleShot() in |
829 | // Modem::readtty() from re-enabling the socket notifier. | 829 | // Modem::readtty() from re-enabling the socket notifier. |
830 | // The port is still held open by the helper process. | 830 | // The port is still held open by the helper process. |
831 | _ifaceppp->modem()->closetty(); | 831 | |
832 | /* Er, there _is_ not QTimer::singleShot() in Modem::readtty(), | ||
833 | and closing the thing prevents pppd from using it later. */ | ||
834 | //_ifaceppp->modem()->closetty(); | ||
832 | 835 | ||
833 | killTimer( main_timer_ID ); | 836 | killTimer( main_timer_ID ); |
834 | 837 | ||
835 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); | 838 | if_timeout_timer->start(_ifaceppp->data()->pppdTimeout()*1000); |
836 | qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000); | 839 | qDebug( "started if timeout timer with %i", _ifaceppp->data()->pppdTimeout()*1000); |
837 | 840 | ||
838 | // find out PPP interface and notify the stats module | 841 | // find out PPP interface and notify the stats module |
839 | // stats->setUnit(pppInterfaceNumber()); | 842 | // stats->setUnit(pppInterfaceNumber()); |
840 | 843 | ||
841 | qApp->flushX(); | 844 | qApp->flushX(); |
842 | semaphore = true; | 845 | semaphore = true; |
843 | result = execppp(); | 846 | result = execppp(); |