Diffstat (limited to 'noncore/apps/opie-console/MyPty.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index b6ae1d9..565d03f 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp @@ -118,8 +118,11 @@ void MyPty::donePty() //waitpid(m_cpid, &status, 0); delete m_sn_e; + delete m_sn_r; m_sn_e = 0l; + m_sn_r = 0l; } m_cpid = 0; + m_fd = -1; // emit done(status); } @@ -186,8 +189,9 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int) // parent - continue as a widget - QSocketNotifier* sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this); + delete m_sn_r; + m_sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this); delete m_sn_e; m_sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,this); - connect(sn_r,SIGNAL(activated(int)),this,SLOT(readPty())); + connect(m_sn_r,SIGNAL(activated(int)),this,SLOT(readPty())); connect(m_sn_e,SIGNAL(activated(int)),this,SLOT(error())); @@ -222,5 +226,5 @@ int MyPty::openPty() if ( ptyfd < 0 ) { - qApp->exit(1); +// qApp->exit(1); return -1; } @@ -235,4 +239,5 @@ MyPty::MyPty(const Profile&) : m_cpid(0) { m_sn_e = 0l; + m_sn_r = 0l; m_fd = openPty(); ProcCtl* ctl = ProcCtl::self(); @@ -255,4 +260,7 @@ QString MyPty::name()const{ } bool MyPty::open() { + if (m_fd < 0) + m_fd = openPty(); + start(); return true; @@ -260,4 +268,5 @@ bool MyPty::open() { void MyPty::close() { donePty(); + m_fd = openPty(); } void MyPty::reload( const Profile& ) { @@ -287,5 +296,4 @@ void MyPty::readPty() if (len == -1 || len == 0) { donePty(); - delete sender(); return; } @@ -307,3 +315,10 @@ void MyPty::readPty() } +QBitArray MyPty::supports()const { + QBitArray ar(3); + ar[0] = 1; + ar[1] = 0; + ar[2] = 0; + return ar; +} |