summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/MyPty.cpp10
-rw-r--r--noncore/apps/opie-console/MyPty.h2
2 files changed, 9 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index cacb4ce..ae01392 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -117,5 +117,7 @@ void MyPty::donePty()
qWarning("killing!!!");
kill(m_cpid, SIGHUP);
- waitpid(m_cpid, &status, 0);
+ //waitpid(m_cpid, &status, 0);
+ delete m_sn_e;
+ m_sn_e = 0l;
}
@@ -187,7 +189,8 @@ 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);
-// QSocketNotifier* sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,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(sn_e,SIGNAL(activated(int)),this,SLOT(error()));
+ connect(m_sn_e,SIGNAL(activated(int)),this,SLOT(error()));
return 0;
@@ -233,4 +236,5 @@ int MyPty::openPty()
MyPty::MyPty(const Profile&) : m_cpid(0)
{
+ m_sn_e = 0l;
m_fd = openPty();
ProcCtl* ctl = ProcCtl::self();
diff --git a/noncore/apps/opie-console/MyPty.h b/noncore/apps/opie-console/MyPty.h
index 9231a8a..3166fa0 100644
--- a/noncore/apps/opie-console/MyPty.h
+++ b/noncore/apps/opie-console/MyPty.h
@@ -29,4 +29,5 @@
class Profile;
+class QSocketNotifier;
class MyPty : public IOLayer
{
@@ -91,4 +92,5 @@ private:
int m_fd;
int m_cpid;
+ QSocketNotifier* m_sn_e;
};