summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_serial.cpp3
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
2 files changed, 7 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index b495f39..77ced85 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -7,2 +7,4 @@
IOSerial::IOSerial(const Profile &config) : IOLayer(config) {
+ m_read = 0l;
+ m_error = 0l;
m_fd = 0;
@@ -114,2 +116,3 @@ bool IOSerial::open() {
emit error(Refuse, tr("Device is already connected"));
+ m_fd = 0;
return FALSE;
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index aeb3742..0bd6a13 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -71,3 +71,3 @@ void MainWindow::initUI() {
m_terminate->addTo( m_console );
- connect(m_disconnect, SIGNAL(activated() ),
+ connect(m_terminate, SIGNAL(activated() ),
this, SLOT(slotTerminate() ) );
@@ -190,2 +190,3 @@ void MainWindow::slotConfigure() {
void MainWindow::slotClose() {
+ qWarning("close");
if (!currentSession() )
@@ -194,6 +195,6 @@ void MainWindow::slotClose() {
tabWidget()->remove( currentSession() );
- tabWidget()->setCurrent( m_sessions.first() );
+ /*it's autodelete */
m_sessions.remove( m_curSession );
- delete m_curSession;
m_curSession = m_sessions.first();
+ tabWidget()->setCurrent( m_curSession );
}